inet: Define IPV4_DEVCONF_MAX
authorThomas Graf <tgraf@infradead.org>
Tue, 16 Nov 2010 04:31:20 +0000 (04:31 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Nov 2010 19:28:25 +0000 (11:28 -0800)
Define IPV4_DEVCONF_MAX to get rid of MAX - 1 notation.

Signed-off-by: Thomas Graf <tgraf@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/inetdevice.h

index 380ba6bc5db1dfaa96912b45426edff4d9b8ec2c..2b86eaf11773fd80cb58d4b4e19b2640ae833dae 100644 (file)
@@ -41,10 +41,12 @@ enum
        __IPV4_DEVCONF_MAX
 };
 
+#define IPV4_DEVCONF_MAX (__IPV4_DEVCONF_MAX - 1)
+
 struct ipv4_devconf {
        void    *sysctl;
-       int     data[__IPV4_DEVCONF_MAX - 1];
-       DECLARE_BITMAP(state, __IPV4_DEVCONF_MAX - 1);
+       int     data[IPV4_DEVCONF_MAX];
+       DECLARE_BITMAP(state, IPV4_DEVCONF_MAX);
 };
 
 struct in_device {
@@ -90,7 +92,7 @@ static inline void ipv4_devconf_set(struct in_device *in_dev, int index,
 
 static inline void ipv4_devconf_setall(struct in_device *in_dev)
 {
-       bitmap_fill(in_dev->cnf.state, __IPV4_DEVCONF_MAX - 1);
+       bitmap_fill(in_dev->cnf.state, IPV4_DEVCONF_MAX);
 }
 
 #define IN_DEV_CONF_GET(in_dev, attr) \