From patchwork Thu Mar 21 14:18:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Vagin X-Patchwork-Id: 229700 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 38F502C00CB for ; Fri, 22 Mar 2013 01:19:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932457Ab3CUOTw (ORCPT ); Thu, 21 Mar 2013 10:19:52 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:40459 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757831Ab3CUOTv (ORCPT ); Thu, 21 Mar 2013 10:19:51 -0400 Received: from localhost.localdomain ([10.24.21.86]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id r2LEJhAY007027; Thu, 21 Mar 2013 18:19:44 +0400 (MSK) From: Andrey Vagin To: Thomas Graf , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: Andrey Vagin , "David S. Miller" , Pavel Emelyanov , Eric Dumazet , "Paul E. McKenney" , David Howells Subject: [PATCH] net: fix *_DIAG_MAX constants Date: Thu, 21 Mar 2013 18:18:20 +0400 Message-Id: <1363875500-14574-1-git-send-email-avagin@openvz.org> X-Mailer: git-send-email 1.8.1.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Follow the common pattern and define *_DIAG_MAX like: [...] __XXX_DIAG_MAX, }; Because everyone is used to do: struct nlattr *attrs[XXX_DIAG_MAX+1]; nla_parse([...], XXX_DIAG_MAX, [...] Reported-by: Thomas Graf Cc: "David S. Miller" Cc: Pavel Emelyanov Cc: Eric Dumazet Cc: "Paul E. McKenney" Cc: David Howells Signed-off-by: Andrey Vagin Acked-by: Thomas Graf --- include/uapi/linux/netlink_diag.h | 4 +++- include/uapi/linux/packet_diag.h | 4 +++- include/uapi/linux/unix_diag.h | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/netlink_diag.h b/include/uapi/linux/netlink_diag.h index 9328866..88009a3 100644 --- a/include/uapi/linux/netlink_diag.h +++ b/include/uapi/linux/netlink_diag.h @@ -29,9 +29,11 @@ enum { NETLINK_DIAG_MEMINFO, NETLINK_DIAG_GROUPS, - NETLINK_DIAG_MAX, + __NETLINK_DIAG_MAX, }; +#define NETLINK_DIAG_MAX (__NETLINK_DIAG_MAX - 1) + #define NDIAG_PROTO_ALL ((__u8) ~0) #define NDIAG_SHOW_MEMINFO 0x00000001 /* show memory info of a socket */ diff --git a/include/uapi/linux/packet_diag.h b/include/uapi/linux/packet_diag.h index 93f5fa9..afafd70 100644 --- a/include/uapi/linux/packet_diag.h +++ b/include/uapi/linux/packet_diag.h @@ -33,9 +33,11 @@ enum { PACKET_DIAG_TX_RING, PACKET_DIAG_FANOUT, - PACKET_DIAG_MAX, + __PACKET_DIAG_MAX, }; +#define PACKET_DIAG_MAX (__PACKET_DIAG_MAX - 1) + struct packet_diag_info { __u32 pdi_index; __u32 pdi_version; diff --git a/include/uapi/linux/unix_diag.h b/include/uapi/linux/unix_diag.h index b8a2494..b9e2a6a 100644 --- a/include/uapi/linux/unix_diag.h +++ b/include/uapi/linux/unix_diag.h @@ -39,9 +39,11 @@ enum { UNIX_DIAG_MEMINFO, UNIX_DIAG_SHUTDOWN, - UNIX_DIAG_MAX, + __UNIX_DIAG_MAX, }; +#define UNIX_DIAG_MAX (__UNIX_DIAG_MAX - 1) + struct unix_diag_vfs { __u32 udiag_vfs_ino; __u32 udiag_vfs_dev;