[VLAN]: Move protocol determination to seperate function

[~andy/linux] / net / ipv4 / devinet.c

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index a2d48173828adbc2710654c9e06a1575367ba04f..e381edb19b2317098ef9d40dd2d18933e718940b 100644 (file)
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -83,7 +83,8 @@ static struct ipv4_devconf ipv4_devconf_dflt = {
        },
 };
 
-#define IPV4_DEVCONF_DFLT(attr) IPV4_DEVCONF(ipv4_devconf_dflt, attr)
+#define IPV4_DEVCONF_DFLT(net, attr) \
+       IPV4_DEVCONF((*net->ipv4.devconf_dflt), attr)
 
 static const struct nla_policy ifa_ipv4_policy[IFA_MAX+1] = {
        [IFA_LOCAL]             = { .type = NLA_U32 },
@@ -164,7 +165,8 @@ static struct in_device *inetdev_init(struct net_device *dev)
        if (!in_dev)
                goto out;
        INIT_RCU_HEAD(&in_dev->rcu_head);
-       memcpy(&in_dev->cnf, &ipv4_devconf_dflt, sizeof(in_dev->cnf));
+       memcpy(&in_dev->cnf, dev->nd_net->ipv4.devconf_dflt,
+                       sizeof(in_dev->cnf));
        in_dev->cnf.sysctl = NULL;
        in_dev->dev = dev;
        if ((in_dev->arp_parms = neigh_parms_alloc(dev, &arp_tbl)) == NULL)
@@ -402,7 +404,7 @@ static int inet_set_ifa(struct net_device *dev, struct in_ifaddr *ifa)
                in_dev_hold(in_dev);
                ifa->ifa_dev = in_dev;
        }
-       if (LOOPBACK(ifa->ifa_local))
+       if (ipv4_is_loopback(ifa->ifa_local))
                ifa->ifa_scope = RT_SCOPE_HOST;
        return inet_insert_ifa(ifa);
 }
@@ -581,7 +583,7 @@ static __inline__ int inet_abc_len(__be32 addr)
 {
        int rc = -1;    /* Something else, probably a multicast. */
 
-       if (ZERONET(addr))
+       if (ipv4_is_zeronet(addr))
                rc = 0;
        else {
                __u32 haddr = ntohl(addr);
@@ -966,28 +968,25 @@ static __be32 confirm_addr_indev(struct in_device *in_dev, __be32 dst,
 
 /*
  * Confirm that local IP address exists using wildcards:
- * - dev: only on this interface, 0=any interface
+ * - in_dev: only on this interface, 0=any interface
  * - dst: only in the same subnet as dst, 0=any dst
  * - local: address, 0=autoselect the local address
  * - scope: maximum allowed scope value for the local address
  */
-__be32 inet_confirm_addr(const struct net_device *dev, __be32 dst, __be32 local, int scope)
+__be32 inet_confirm_addr(struct in_device *in_dev,
+                        __be32 dst, __be32 local, int scope)
 {
        __be32 addr = 0;
-       struct in_device *in_dev;
+       struct net_device *dev;
+       struct net *net;
 
-       if (dev) {
-               rcu_read_lock();
-               if ((in_dev = __in_dev_get_rcu(dev)))
-                       addr = confirm_addr_indev(in_dev, dst, local, scope);
-               rcu_read_unlock();
-
-               return addr;
-       }
+       if (scope != RT_SCOPE_LINK)
+               return confirm_addr_indev(in_dev, dst, local, scope);
 
+       net = in_dev->dev->nd_net;
        read_lock(&dev_base_lock);
        rcu_read_lock();
-       for_each_netdev(&init_net, dev) {
+       for_each_netdev(net, dev) {
                if ((in_dev = __in_dev_get_rcu(dev))) {
                        addr = confirm_addr_indev(in_dev, dst, local, scope);
                        if (addr)
@@ -1247,7 +1246,7 @@ static void devinet_copy_dflt_conf(struct net *net, int i)
                rcu_read_lock();
                in_dev = __in_dev_get_rcu(dev);
                if (in_dev && !test_bit(i, in_dev->cnf.state))
-                       in_dev->cnf.data[i] = ipv4_devconf_dflt.data[i];
+                       in_dev->cnf.data[i] = net->ipv4.devconf_dflt->data[i];
                rcu_read_unlock();
        }
        read_unlock(&dev_base_lock);
@@ -1256,10 +1255,10 @@ static void devinet_copy_dflt_conf(struct net *net, int i)
 static void inet_forward_change(struct net *net)
 {
        struct net_device *dev;
-       int on = IPV4_DEVCONF_ALL(FORWARDING);
+       int on = IPV4_DEVCONF_ALL(net, FORWARDING);
 
-       IPV4_DEVCONF_ALL(ACCEPT_REDIRECTS) = !on;
-       IPV4_DEVCONF_DFLT(FORWARDING) = on;
+       IPV4_DEVCONF_ALL(net, ACCEPT_REDIRECTS) = !on;
+       IPV4_DEVCONF_DFLT(net, FORWARDING) = on;
 
        read_lock(&dev_base_lock);
        for_each_netdev(net, dev) {
@@ -1288,7 +1287,7 @@ static int devinet_conf_proc(ctl_table *ctl, int write,
 
                set_bit(i, cnf->state);
 
-               if (cnf == &ipv4_devconf_dflt)
+               if (cnf == net->ipv4.devconf_dflt)
                        devinet_copy_dflt_conf(net, i);
        }
 
@@ -1341,7 +1340,7 @@ static int devinet_conf_sysctl(ctl_table *table, int __user *name, int nlen,
 
        set_bit(i, cnf->state);
 
-       if (cnf == &ipv4_devconf_dflt)
+       if (cnf == net->ipv4.devconf_dflt)
                devinet_copy_dflt_conf(net, i);
 
        return 1;
@@ -1358,9 +1357,9 @@ static int devinet_sysctl_forward(ctl_table *ctl, int write,
        if (write && *valp != val) {
                struct net *net = ctl->extra2;
 
-               if (valp == &IPV4_DEVCONF_ALL(FORWARDING))
+               if (valp == &IPV4_DEVCONF_ALL(net, FORWARDING))
                        inet_forward_change(net);
-               else if (valp != &IPV4_DEVCONF_DFLT(FORWARDING))
+               else if (valp != &IPV4_DEVCONF_DFLT(net, FORWARDING))
                        rt_cache_flush(0);
        }
 
@@ -1540,7 +1539,6 @@ static void devinet_sysctl_unregister(struct in_device *idev)
        __devinet_sysctl_unregister(&idev->cnf);
        neigh_sysctl_unregister(idev->arp_parms);
 }
-#endif
 
 static struct ctl_table ctl_forward_entry[] = {
        {
@@ -1563,18 +1561,20 @@ static __net_initdata struct ctl_path net_ipv4_path[] = {
        { .procname = "ipv4", .ctl_name = NET_IPV4, },
        { },
 };
+#endif
 
 static __net_init int devinet_init_net(struct net *net)
 {
        int err;
-       struct ctl_table *tbl;
        struct ipv4_devconf *all, *dflt;
+#ifdef CONFIG_SYSCTL
+       struct ctl_table *tbl = ctl_forward_entry;
        struct ctl_table_header *forw_hdr;
+#endif
 
        err = -ENOMEM;
        all = &ipv4_devconf;
        dflt = &ipv4_devconf_dflt;
-       tbl = ctl_forward_entry;
 
        if (net != &init_net) {
                all = kmemdup(all, sizeof(ipv4_devconf), GFP_KERNEL);
@@ -1585,6 +1585,7 @@ static __net_init int devinet_init_net(struct net *net)
                if (dflt == NULL)
                        goto err_alloc_dflt;
 
+#ifdef CONFIG_SYSCTL
                tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
                if (tbl == NULL)
                        goto err_alloc_ctl;
@@ -1592,6 +1593,7 @@ static __net_init int devinet_init_net(struct net *net)
                tbl[0].data = &all->data[NET_IPV4_CONF_FORWARDING - 1];
                tbl[0].extra1 = all;
                tbl[0].extra2 = net;
+#endif
        }
 
 #ifdef CONFIG_SYSCTL
@@ -1609,9 +1611,9 @@ static __net_init int devinet_init_net(struct net *net)
        forw_hdr = register_net_sysctl_table(net, net_ipv4_path, tbl);
        if (forw_hdr == NULL)
                goto err_reg_ctl;
+       net->ipv4.forw_hdr = forw_hdr;
 #endif
 
-       net->ipv4.forw_hdr = forw_hdr;
        net->ipv4.devconf_all = all;
        net->ipv4.devconf_dflt = dflt;
        return 0;
@@ -1624,8 +1626,8 @@ err_reg_dflt:
 err_reg_all:
        if (tbl != ctl_forward_entry)
                kfree(tbl);
-#endif
 err_alloc_ctl:
+#endif
        if (dflt != &ipv4_devconf_dflt)
                kfree(dflt);
 err_alloc_dflt:
@@ -1637,15 +1639,15 @@ err_alloc_all:
 
 static __net_exit void devinet_exit_net(struct net *net)
 {
+#ifdef CONFIG_SYSCTL
        struct ctl_table *tbl;
 
        tbl = net->ipv4.forw_hdr->ctl_table_arg;
-#ifdef CONFIG_SYSCTL
        unregister_net_sysctl_table(net->ipv4.forw_hdr);
        __devinet_sysctl_unregister(net->ipv4.devconf_dflt);
        __devinet_sysctl_unregister(net->ipv4.devconf_all);
-#endif
        kfree(tbl);
+#endif
        kfree(net->ipv4.devconf_dflt);
        kfree(net->ipv4.devconf_all);
 }