[IPV4]: Convert IPv4 devconf to an array

This patch converts the ipv4_devconf config members (everything except
sysctl) to an array.  This allows easier manipulation which will be
needed later on to provide better management of default config values.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 8 deletions

diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index f4dd47453108..a646409c2d06 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -128,14 +128,16 @@
  * contradict to specs provided this delay is small enough.
  */
 
-#define IGMP_V1_SEEN(in_dev) (ipv4_devconf.force_igmp_version == 1 || \
-                (in_dev)->cnf.force_igmp_version == 1 || \
-                ((in_dev)->mr_v1_seen && \
-                time_before(jiffies, (in_dev)->mr_v1_seen)))
-#define IGMP_V2_SEEN(in_dev) (ipv4_devconf.force_igmp_version == 2 || \
-                (in_dev)->cnf.force_igmp_version == 2 || \
-                ((in_dev)->mr_v2_seen && \
-                time_before(jiffies, (in_dev)->mr_v2_seen)))
+#define IGMP_V1_SEEN(in_dev) \
+        (IPV4_DEVCONF_ALL(FORCE_IGMP_VERSION) == 1 || \
+         IN_DEV_CONF_GET((in_dev), FORCE_IGMP_VERSION) == 1 || \
+         ((in_dev)->mr_v1_seen && \
+          time_before(jiffies, (in_dev)->mr_v1_seen)))
+#define IGMP_V2_SEEN(in_dev) \
+        (IPV4_DEVCONF_ALL(FORCE_IGMP_VERSION) == 2 || \
+         IN_DEV_CONF_GET((in_dev), FORCE_IGMP_VERSION) == 2 || \
+         ((in_dev)->mr_v2_seen && \
+          time_before(jiffies, (in_dev)->mr_v2_seen)))
 
 static void igmpv3_add_delrec(struct in_device *in_dev, struct ip_mc_list *im);
 static void igmpv3_del_delrec(struct in_device *in_dev, __be32 multiaddr);