From 2fcf1ee53325d1c232ac5c581de10307cf0c52f0 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Tue, 16 Nov 2010 04:31:20 +0000 Subject: [PATCH] --- yaml --- r: 224419 b: refs/heads/master c: ca7479ebbd9f7621646bf2792cb7143647f035bb h: refs/heads/master i: 224417: 6089da719624fafe29039b2570ff856e3d3a5cf7 224415: ff53a2a581ad61519e101cc9ebd11e1b766b85d0 v: v3 --- [refs] | 2 +- trunk/include/linux/inetdevice.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8ac39b513300..23e385358e7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8ff182c716c6f11ca3061961f5722f26a14e101 +refs/heads/master: ca7479ebbd9f7621646bf2792cb7143647f035bb diff --git a/trunk/include/linux/inetdevice.h b/trunk/include/linux/inetdevice.h index 380ba6bc5db1..2b86eaf11773 100644 --- a/trunk/include/linux/inetdevice.h +++ b/trunk/include/linux/inetdevice.h @@ -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) \