ipmr: missing dev_put() on error path in vif_add()

[safe/jmp/linux-2.6] / net / ipv4 / ipmr.c

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 65f1200..99508d6 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1,7 +1,7 @@
 /*
  *     IP multicast routing support for mrouted 3.6/3.8
  *
 /*
  *     IP multicast routing support for mrouted 3.6/3.8
  *

- *             (c) 1995 Alan Cox, <alan@redhat.com>
+ *             (c) 1995 Alan Cox, <alan@lxorguk.ukuu.org.uk>

  *       Linux Consultancy and Custom Driver Development
  *
  *     This program is free software; you can redistribute it and/or
  *       Linux Consultancy and Custom Driver Development
  *
  *     This program is free software; you can redistribute it and/or


@@ -9,8 +9,6 @@
  *     as published by the Free Software Foundation; either version
  *     2 of the License, or (at your option) any later version.
  *
  *     as published by the Free Software Foundation; either version
  *     2 of the License, or (at your option) any later version.
  *

- *     Version: $Id: ipmr.c,v 1.65 2001/10/31 21:55:54 davem Exp $
- *

  *     Fixes:
  *     Michael Chastain        :       Incorrect size of copying.
  *     Alan Cox                :       Added the cache manager code
  *     Fixes:
  *     Michael Chastain        :       Incorrect size of copying.
  *     Alan Cox                :       Added the cache manager code


@@ -69,9 +67,6 @@
 #define CONFIG_IP_PIMSM        1
 #endif
 
 #define CONFIG_IP_PIMSM        1
 #endif
 

-static struct sock *mroute_socket;
-
-

 /* Big lock, protecting vif table, mrt cache and mroute socket state.
    Note that the changes are semaphored via rtnl_lock.
  */
 /* Big lock, protecting vif table, mrt cache and mroute socket state.
    Note that the changes are semaphored via rtnl_lock.
  */


@@ -82,18 +77,9 @@ static DEFINE_RWLOCK(mrt_lock);
  *     Multicast router control variables
  */
 
  *     Multicast router control variables
  */
 

-static struct vif_device vif_table[MAXVIFS];           /* Devices              */
-static int maxvif;
-
-#define VIF_EXISTS(idx) (vif_table[idx].dev != NULL)
-
-static int mroute_do_assert;                           /* Set in PIM assert    */
-static int mroute_do_pim;
-
-static struct mfc_cache *mfc_cache_array[MFC_LINES];   /* Forwarding cache     */
+#define VIF_EXISTS(_net, _idx) ((_net)->ipv4.vif_table[_idx].dev != NULL)

 
 static struct mfc_cache *mfc_unres_queue;              /* Queue of unresolved entries */
 
 static struct mfc_cache *mfc_unres_queue;              /* Queue of unresolved entries */

-static atomic_t cache_resolve_queue_len;               /* Size of unresolved   */

 
 /* Special spinlock for queue of unresolved entries */
 static DEFINE_SPINLOCK(mfc_unres_lock);
 
 /* Special spinlock for queue of unresolved entries */
 static DEFINE_SPINLOCK(mfc_unres_lock);


@@ -109,28 +95,56 @@ static DEFINE_SPINLOCK(mfc_unres_lock);
 static struct kmem_cache *mrt_cachep __read_mostly;
 
 static int ip_mr_forward(struct sk_buff *skb, struct mfc_cache *cache, int local);
 static struct kmem_cache *mrt_cachep __read_mostly;
 
 static int ip_mr_forward(struct sk_buff *skb, struct mfc_cache *cache, int local);

-static int ipmr_cache_report(struct sk_buff *pkt, vifi_t vifi, int assert);
+static int ipmr_cache_report(struct net *net,
+                            struct sk_buff *pkt, vifi_t vifi, int assert);

 static int ipmr_fill_mroute(struct sk_buff *skb, struct mfc_cache *c, struct rtmsg *rtm);
 
 static int ipmr_fill_mroute(struct sk_buff *skb, struct mfc_cache *c, struct rtmsg *rtm);
 

-#ifdef CONFIG_IP_PIMSM_V2
-static struct net_protocol pim_protocol;
-#endif
-

 static struct timer_list ipmr_expire_timer;
 
 /* Service routines creating virtual interfaces: DVMRP tunnels and PIMREG */
 
 static struct timer_list ipmr_expire_timer;
 
 /* Service routines creating virtual interfaces: DVMRP tunnels and PIMREG */
 

+static void ipmr_del_tunnel(struct net_device *dev, struct vifctl *v)
+{
+       struct net *net = dev_net(dev);
+
+       dev_close(dev);
+
+       dev = __dev_get_by_name(net, "tunl0");
+       if (dev) {
+               const struct net_device_ops *ops = dev->netdev_ops;
+               struct ifreq ifr;
+               struct ip_tunnel_parm p;
+
+               memset(&p, 0, sizeof(p));
+               p.iph.daddr = v->vifc_rmt_addr.s_addr;
+               p.iph.saddr = v->vifc_lcl_addr.s_addr;
+               p.iph.version = 4;
+               p.iph.ihl = 5;
+               p.iph.protocol = IPPROTO_IPIP;
+               sprintf(p.name, "dvmrp%d", v->vifc_vifi);
+               ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
+
+               if (ops->ndo_do_ioctl) {
+                       mm_segment_t oldfs = get_fs();
+
+                       set_fs(KERNEL_DS);
+                       ops->ndo_do_ioctl(dev, &ifr, SIOCDELTUNNEL);
+                       set_fs(oldfs);
+               }
+       }
+}
+

 static
 static

-struct net_device *ipmr_new_tunnel(struct vifctl *v)
+struct net_device *ipmr_new_tunnel(struct net *net, struct vifctl *v)

 {
        struct net_device  *dev;
 
 {
        struct net_device  *dev;
 

-       dev = __dev_get_by_name(&init_net, "tunl0");
+       dev = __dev_get_by_name(net, "tunl0");

 
        if (dev) {
 
        if (dev) {

+               const struct net_device_ops *ops = dev->netdev_ops;

                int err;
                struct ifreq ifr;
                int err;
                struct ifreq ifr;

-               mm_segment_t    oldfs;

                struct ip_tunnel_parm p;
                struct in_device  *in_dev;
 
                struct ip_tunnel_parm p;
                struct in_device  *in_dev;
 


@@ -143,13 +157,19 @@ struct net_device *ipmr_new_tunnel(struct vifctl *v)
                sprintf(p.name, "dvmrp%d", v->vifc_vifi);
                ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
 
                sprintf(p.name, "dvmrp%d", v->vifc_vifi);
                ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
 

-               oldfs = get_fs(); set_fs(KERNEL_DS);
-               err = dev->do_ioctl(dev, &ifr, SIOCADDTUNNEL);
-               set_fs(oldfs);
+               if (ops->ndo_do_ioctl) {
+                       mm_segment_t oldfs = get_fs();
+
+                       set_fs(KERNEL_DS);
+                       err = ops->ndo_do_ioctl(dev, &ifr, SIOCADDTUNNEL);
+                       set_fs(oldfs);
+               } else
+                       err = -EOPNOTSUPP;

 
                dev = NULL;
 
 
                dev = NULL;
 

-               if (err == 0 && (dev = __dev_get_by_name(&init_net, p.name)) != NULL) {
+               if (err == 0 &&
+                   (dev = __dev_get_by_name(net, p.name)) != NULL) {

                        dev->flags |= IFF_MULTICAST;
 
                        in_dev = __in_dev_get_rtnl(dev);
                        dev->flags |= IFF_MULTICAST;
 
                        in_dev = __in_dev_get_rtnl(dev);


@@ -161,6 +181,7 @@ struct net_device *ipmr_new_tunnel(struct vifctl *v)
 
                        if (dev_open(dev))
                                goto failure;
 
                        if (dev_open(dev))
                                goto failure;

+                       dev_hold(dev);

                }
        }
        return dev;
                }
        }
        return dev;


@@ -176,45 +197,46 @@ failure:
 
 #ifdef CONFIG_IP_PIMSM
 
 
 #ifdef CONFIG_IP_PIMSM
 

-static int reg_vif_num = -1;
-
-static int reg_vif_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t reg_vif_xmit(struct sk_buff *skb, struct net_device *dev)

 {
 {

+       struct net *net = dev_net(dev);
+

        read_lock(&mrt_lock);
        read_lock(&mrt_lock);

-       ((struct net_device_stats*)netdev_priv(dev))->tx_bytes += skb->len;
-       ((struct net_device_stats*)netdev_priv(dev))->tx_packets++;
-       ipmr_cache_report(skb, reg_vif_num, IGMPMSG_WHOLEPKT);
+       dev->stats.tx_bytes += skb->len;
+       dev->stats.tx_packets++;
+       ipmr_cache_report(net, skb, net->ipv4.mroute_reg_vif_num,
+                         IGMPMSG_WHOLEPKT);

        read_unlock(&mrt_lock);
        kfree_skb(skb);
        read_unlock(&mrt_lock);
        kfree_skb(skb);

-       return 0;
+       return NETDEV_TX_OK;

 }
 
 }
 

-static struct net_device_stats *reg_vif_get_stats(struct net_device *dev)
-{
-       return (struct net_device_stats*)netdev_priv(dev);
-}
+static const struct net_device_ops reg_vif_netdev_ops = {
+       .ndo_start_xmit = reg_vif_xmit,
+};

 
 static void reg_vif_setup(struct net_device *dev)
 {
        dev->type               = ARPHRD_PIMREG;
        dev->mtu                = ETH_DATA_LEN - sizeof(struct iphdr) - 8;
        dev->flags              = IFF_NOARP;
 
 static void reg_vif_setup(struct net_device *dev)
 {
        dev->type               = ARPHRD_PIMREG;
        dev->mtu                = ETH_DATA_LEN - sizeof(struct iphdr) - 8;
        dev->flags              = IFF_NOARP;

-       dev->hard_start_xmit    = reg_vif_xmit;
-       dev->get_stats          = reg_vif_get_stats;
+       dev->netdev_ops         = &reg_vif_netdev_ops,

        dev->destructor         = free_netdev;
        dev->destructor         = free_netdev;

+       dev->features           |= NETIF_F_NETNS_LOCAL;

 }
 
 }
 

-static struct net_device *ipmr_reg_vif(void)
+static struct net_device *ipmr_reg_vif(struct net *net)

 {
        struct net_device *dev;
        struct in_device *in_dev;
 
 {
        struct net_device *dev;
        struct in_device *in_dev;
 

-       dev = alloc_netdev(sizeof(struct net_device_stats), "pimreg",
-                          reg_vif_setup);
+       dev = alloc_netdev(0, "pimreg", reg_vif_setup);

 
        if (dev == NULL)
                return NULL;
 
 
        if (dev == NULL)
                return NULL;
 

+       dev_net_set(dev, net);
+

        if (register_netdevice(dev)) {
                free_netdev(dev);
                return NULL;
        if (register_netdevice(dev)) {
                free_netdev(dev);
                return NULL;


@@ -234,6 +256,8 @@ static struct net_device *ipmr_reg_vif(void)
        if (dev_open(dev))
                goto failure;
 
        if (dev_open(dev))
                goto failure;
 

+       dev_hold(dev);
+

        return dev;
 
 failure:
        return dev;
 
 failure:


@@ -248,18 +272,19 @@ failure:
 
 /*
  *     Delete a VIF entry
 
 /*
  *     Delete a VIF entry

+ *     @notify: Set to 1, if the caller is a notifier_call

  */
 
  */
 

-static int vif_delete(int vifi)
+static int vif_delete(struct net *net, int vifi, int notify)

 {
        struct vif_device *v;
        struct net_device *dev;
        struct in_device *in_dev;
 
 {
        struct vif_device *v;
        struct net_device *dev;
        struct in_device *in_dev;
 

-       if (vifi < 0 || vifi >= maxvif)
+       if (vifi < 0 || vifi >= net->ipv4.maxvif)

                return -EADDRNOTAVAIL;
 
                return -EADDRNOTAVAIL;
 

-       v = &vif_table[vifi];
+       v = &net->ipv4.vif_table[vifi];

 
        write_lock_bh(&mrt_lock);
        dev = v->dev;
 
        write_lock_bh(&mrt_lock);
        dev = v->dev;


@@ -271,17 +296,17 @@ static int vif_delete(int vifi)
        }
 
 #ifdef CONFIG_IP_PIMSM
        }
 
 #ifdef CONFIG_IP_PIMSM

-       if (vifi == reg_vif_num)
-               reg_vif_num = -1;
+       if (vifi == net->ipv4.mroute_reg_vif_num)
+               net->ipv4.mroute_reg_vif_num = -1;

 #endif
 
 #endif
 

-       if (vifi+1 == maxvif) {
+       if (vifi+1 == net->ipv4.maxvif) {

                int tmp;
                for (tmp=vifi-1; tmp>=0; tmp--) {
                int tmp;
                for (tmp=vifi-1; tmp>=0; tmp--) {

-                       if (VIF_EXISTS(tmp))
+                       if (VIF_EXISTS(net, tmp))

                                break;
                }
                                break;
                }

-               maxvif = tmp+1;
+               net->ipv4.maxvif = tmp+1;

        }
 
        write_unlock_bh(&mrt_lock);
        }
 
        write_unlock_bh(&mrt_lock);


@@ -293,13 +318,19 @@ static int vif_delete(int vifi)
                ip_rt_multicast_event(in_dev);
        }
 
                ip_rt_multicast_event(in_dev);
        }
 

-       if (v->flags&(VIFF_TUNNEL|VIFF_REGISTER))
+       if (v->flags&(VIFF_TUNNEL|VIFF_REGISTER) && !notify)

                unregister_netdevice(dev);
 
        dev_put(dev);
        return 0;
 }
 
                unregister_netdevice(dev);
 
        dev_put(dev);
        return 0;
 }
 

+static inline void ipmr_cache_free(struct mfc_cache *c)
+{
+       release_net(mfc_net(c));
+       kmem_cache_free(mrt_cachep, c);
+}
+

 /* Destroy an unresolved cache entry, killing queued skbs
    and reporting error to netlink readers.
  */
 /* Destroy an unresolved cache entry, killing queued skbs
    and reporting error to netlink readers.
  */


@@ -308,10 +339,11 @@ static void ipmr_destroy_unres(struct mfc_cache *c)
 {
        struct sk_buff *skb;
        struct nlmsgerr *e;
 {
        struct sk_buff *skb;
        struct nlmsgerr *e;

+       struct net *net = mfc_net(c);

 
 

-       atomic_dec(&cache_resolve_queue_len);
+       atomic_dec(&net->ipv4.cache_resolve_queue_len);

 
 

-       while ((skb=skb_dequeue(&c->mfc_un.unres.unresolved))) {
+       while ((skb = skb_dequeue(&c->mfc_un.unres.unresolved))) {

                if (ip_hdr(skb)->version == 0) {
                        struct nlmsghdr *nlh = (struct nlmsghdr *)skb_pull(skb, sizeof(struct iphdr));
                        nlh->nlmsg_type = NLMSG_ERROR;
                if (ip_hdr(skb)->version == 0) {
                        struct nlmsghdr *nlh = (struct nlmsghdr *)skb_pull(skb, sizeof(struct iphdr));
                        nlh->nlmsg_type = NLMSG_ERROR;


@@ -321,12 +353,12 @@ static void ipmr_destroy_unres(struct mfc_cache *c)
                        e->error = -ETIMEDOUT;
                        memset(&e->msg, 0, sizeof(e->msg));
 
                        e->error = -ETIMEDOUT;
                        memset(&e->msg, 0, sizeof(e->msg));
 

-                       rtnl_unicast(skb, &init_net, NETLINK_CB(skb).pid);
+                       rtnl_unicast(skb, net, NETLINK_CB(skb).pid);

                } else
                        kfree_skb(skb);
        }
 
                } else
                        kfree_skb(skb);
        }
 

-       kmem_cache_free(mrt_cachep, c);
+       ipmr_cache_free(c);

 }
 
 
 }
 
 


@@ -343,7 +375,7 @@ static void ipmr_expire_process(unsigned long dummy)
                return;
        }
 
                return;
        }
 

-       if (atomic_read(&cache_resolve_queue_len) == 0)
+       if (mfc_unres_queue == NULL)

                goto out;
 
        now = jiffies;
                goto out;
 
        now = jiffies;


@@ -364,7 +396,7 @@ static void ipmr_expire_process(unsigned long dummy)
                ipmr_destroy_unres(c);
        }
 
                ipmr_destroy_unres(c);
        }
 

-       if (atomic_read(&cache_resolve_queue_len))
+       if (mfc_unres_queue != NULL)

                mod_timer(&ipmr_expire_timer, jiffies + expires);
 
 out:
                mod_timer(&ipmr_expire_timer, jiffies + expires);
 
 out:


@@ -376,13 +408,15 @@ out:
 static void ipmr_update_thresholds(struct mfc_cache *cache, unsigned char *ttls)
 {
        int vifi;
 static void ipmr_update_thresholds(struct mfc_cache *cache, unsigned char *ttls)
 {
        int vifi;

+       struct net *net = mfc_net(cache);

 
        cache->mfc_un.res.minvif = MAXVIFS;
        cache->mfc_un.res.maxvif = 0;
        memset(cache->mfc_un.res.ttls, 255, MAXVIFS);
 
 
        cache->mfc_un.res.minvif = MAXVIFS;
        cache->mfc_un.res.maxvif = 0;
        memset(cache->mfc_un.res.ttls, 255, MAXVIFS);
 

-       for (vifi=0; vifi<maxvif; vifi++) {
-               if (VIF_EXISTS(vifi) && ttls[vifi] && ttls[vifi] < 255) {
+       for (vifi = 0; vifi < net->ipv4.maxvif; vifi++) {
+               if (VIF_EXISTS(net, vifi) &&
+                   ttls[vifi] && ttls[vifi] < 255) {

                        cache->mfc_un.res.ttls[vifi] = ttls[vifi];
                        if (cache->mfc_un.res.minvif > vifi)
                                cache->mfc_un.res.minvif = vifi;
                        cache->mfc_un.res.ttls[vifi] = ttls[vifi];
                        if (cache->mfc_un.res.minvif > vifi)
                                cache->mfc_un.res.minvif = vifi;


@@ -392,15 +426,16 @@ static void ipmr_update_thresholds(struct mfc_cache *cache, unsigned char *ttls)
        }
 }
 
        }
 }
 

-static int vif_add(struct vifctl *vifc, int mrtsock)
+static int vif_add(struct net *net, struct vifctl *vifc, int mrtsock)

 {
        int vifi = vifc->vifc_vifi;
 {
        int vifi = vifc->vifc_vifi;

-       struct vif_device *v = &vif_table[vifi];
+       struct vif_device *v = &net->ipv4.vif_table[vifi];

        struct net_device *dev;
        struct in_device *in_dev;
        struct net_device *dev;
        struct in_device *in_dev;

+       int err;

 
        /* Is vif busy ? */
 
        /* Is vif busy ? */

-       if (VIF_EXISTS(vifi))
+       if (VIF_EXISTS(net, vifi))

                return -EADDRINUSE;
 
        switch (vifc->vifc_flags) {
                return -EADDRINUSE;
 
        switch (vifc->vifc_flags) {


@@ -410,44 +445,61 @@ static int vif_add(struct vifctl *vifc, int mrtsock)
                 * Special Purpose VIF in PIM
                 * All the packets will be sent to the daemon
                 */
                 * Special Purpose VIF in PIM
                 * All the packets will be sent to the daemon
                 */

-               if (reg_vif_num >= 0)
+               if (net->ipv4.mroute_reg_vif_num >= 0)

                        return -EADDRINUSE;
                        return -EADDRINUSE;

-               dev = ipmr_reg_vif();
+               dev = ipmr_reg_vif(net);

                if (!dev)
                        return -ENOBUFS;
                if (!dev)
                        return -ENOBUFS;

+               err = dev_set_allmulti(dev, 1);
+               if (err) {
+                       unregister_netdevice(dev);
+                       dev_put(dev);
+                       return err;
+               }

                break;
 #endif
        case VIFF_TUNNEL:
                break;
 #endif
        case VIFF_TUNNEL:

-               dev = ipmr_new_tunnel(vifc);
+               dev = ipmr_new_tunnel(net, vifc);

                if (!dev)
                        return -ENOBUFS;
                if (!dev)
                        return -ENOBUFS;

+               err = dev_set_allmulti(dev, 1);
+               if (err) {
+                       ipmr_del_tunnel(dev, vifc);
+                       dev_put(dev);
+                       return err;
+               }

                break;
        case 0:
                break;
        case 0:

-               dev = ip_dev_find(&init_net, vifc->vifc_lcl_addr.s_addr);
+               dev = ip_dev_find(net, vifc->vifc_lcl_addr.s_addr);

                if (!dev)
                        return -EADDRNOTAVAIL;
                if (!dev)
                        return -EADDRNOTAVAIL;

-               dev_put(dev);
+               err = dev_set_allmulti(dev, 1);
+               if (err) {
+                       dev_put(dev);
+                       return err;
+               }

                break;
        default:
                return -EINVAL;
        }
 
                break;
        default:
                return -EINVAL;
        }
 

-       if ((in_dev = __in_dev_get_rtnl(dev)) == NULL)
+       if ((in_dev = __in_dev_get_rtnl(dev)) == NULL) {
+               dev_put(dev);

                return -EADDRNOTAVAIL;
                return -EADDRNOTAVAIL;

+       }

        IPV4_DEVCONF(in_dev->cnf, MC_FORWARDING)++;
        IPV4_DEVCONF(in_dev->cnf, MC_FORWARDING)++;

-       dev_set_allmulti(dev, +1);

        ip_rt_multicast_event(in_dev);
 
        /*
         *      Fill in the VIF structures
         */
        ip_rt_multicast_event(in_dev);
 
        /*
         *      Fill in the VIF structures
         */

-       v->rate_limit=vifc->vifc_rate_limit;
-       v->local=vifc->vifc_lcl_addr.s_addr;
-       v->remote=vifc->vifc_rmt_addr.s_addr;
-       v->flags=vifc->vifc_flags;
+       v->rate_limit = vifc->vifc_rate_limit;
+       v->local = vifc->vifc_lcl_addr.s_addr;
+       v->remote = vifc->vifc_rmt_addr.s_addr;
+       v->flags = vifc->vifc_flags;

        if (!mrtsock)
                v->flags |= VIFF_STATIC;
        if (!mrtsock)
                v->flags |= VIFF_STATIC;

-       v->threshold=vifc->vifc_threshold;
+       v->threshold = vifc->vifc_threshold;

        v->bytes_in = 0;
        v->bytes_out = 0;
        v->pkt_in = 0;
        v->bytes_in = 0;
        v->bytes_out = 0;
        v->pkt_in = 0;


@@ -458,24 +510,25 @@ static int vif_add(struct vifctl *vifc, int mrtsock)
 
        /* And finish update writing critical data */
        write_lock_bh(&mrt_lock);
 
        /* And finish update writing critical data */
        write_lock_bh(&mrt_lock);

-       dev_hold(dev);
-       v->dev=dev;
+       v->dev = dev;

 #ifdef CONFIG_IP_PIMSM
        if (v->flags&VIFF_REGISTER)
 #ifdef CONFIG_IP_PIMSM
        if (v->flags&VIFF_REGISTER)

-               reg_vif_num = vifi;
+               net->ipv4.mroute_reg_vif_num = vifi;

 #endif
 #endif

-       if (vifi+1 > maxvif)
-               maxvif = vifi+1;
+       if (vifi+1 > net->ipv4.maxvif)
+               net->ipv4.maxvif = vifi+1;

        write_unlock_bh(&mrt_lock);
        return 0;
 }
 
        write_unlock_bh(&mrt_lock);
        return 0;
 }
 

-static struct mfc_cache *ipmr_cache_find(__be32 origin, __be32 mcastgrp)
+static struct mfc_cache *ipmr_cache_find(struct net *net,
+                                        __be32 origin,
+                                        __be32 mcastgrp)

 {
 {

-       int line=MFC_HASH(mcastgrp,origin);
+       int line = MFC_HASH(mcastgrp, origin);

        struct mfc_cache *c;
 
        struct mfc_cache *c;
 

-       for (c=mfc_cache_array[line]; c; c = c->next) {
+       for (c = net->ipv4.mfc_cache_array[line]; c; c = c->next) {

                if (c->mfc_origin==origin && c->mfc_mcastgrp==mcastgrp)
                        break;
        }
                if (c->mfc_origin==origin && c->mfc_mcastgrp==mcastgrp)
                        break;
        }


@@ -485,22 +538,24 @@ static struct mfc_cache *ipmr_cache_find(__be32 origin, __be32 mcastgrp)
 /*
  *     Allocate a multicast cache entry
  */
 /*
  *     Allocate a multicast cache entry
  */

-static struct mfc_cache *ipmr_cache_alloc(void)
+static struct mfc_cache *ipmr_cache_alloc(struct net *net)

 {
 {

-       struct mfc_cache *c=kmem_cache_zalloc(mrt_cachep, GFP_KERNEL);
-       if (c==NULL)
+       struct mfc_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_KERNEL);
+       if (c == NULL)

                return NULL;
        c->mfc_un.res.minvif = MAXVIFS;
                return NULL;
        c->mfc_un.res.minvif = MAXVIFS;

+       mfc_net_set(c, net);

        return c;
 }
 
        return c;
 }
 

-static struct mfc_cache *ipmr_cache_alloc_unres(void)
+static struct mfc_cache *ipmr_cache_alloc_unres(struct net *net)

 {
 {

-       struct mfc_cache *c=kmem_cache_zalloc(mrt_cachep, GFP_ATOMIC);
-       if (c==NULL)
+       struct mfc_cache *c = kmem_cache_zalloc(mrt_cachep, GFP_ATOMIC);
+       if (c == NULL)

                return NULL;
        skb_queue_head_init(&c->mfc_un.unres.unresolved);
        c->mfc_un.unres.expires = jiffies + 10*HZ;
                return NULL;
        skb_queue_head_init(&c->mfc_un.unres.unresolved);
        c->mfc_un.unres.expires = jiffies + 10*HZ;

+       mfc_net_set(c, net);

        return c;
 }
 
        return c;
 }
 


@@ -517,7 +572,7 @@ static void ipmr_cache_resolve(struct mfc_cache *uc, struct mfc_cache *c)
         *      Play the pending entries through our router
         */
 
         *      Play the pending entries through our router
         */
 

-       while ((skb=__skb_dequeue(&uc->mfc_un.unres.unresolved))) {
+       while ((skb = __skb_dequeue(&uc->mfc_un.unres.unresolved))) {

                if (ip_hdr(skb)->version == 0) {
                        struct nlmsghdr *nlh = (struct nlmsghdr *)skb_pull(skb, sizeof(struct iphdr));
 
                if (ip_hdr(skb)->version == 0) {
                        struct nlmsghdr *nlh = (struct nlmsghdr *)skb_pull(skb, sizeof(struct iphdr));
 


@@ -533,7 +588,7 @@ static void ipmr_cache_resolve(struct mfc_cache *uc, struct mfc_cache *c)
                                memset(&e->msg, 0, sizeof(e->msg));
                        }
 
                                memset(&e->msg, 0, sizeof(e->msg));
                        }
 

-                       rtnl_unicast(skb, &init_net, NETLINK_CB(skb).pid);
+                       rtnl_unicast(skb, mfc_net(c), NETLINK_CB(skb).pid);

                } else
                        ip_mr_forward(skb, c, 0);
        }
                } else
                        ip_mr_forward(skb, c, 0);
        }


@@ -546,7 +601,8 @@ static void ipmr_cache_resolve(struct mfc_cache *uc, struct mfc_cache *c)
  *     Called under mrt_lock.
  */
 
  *     Called under mrt_lock.
  */
 

-static int ipmr_cache_report(struct sk_buff *pkt, vifi_t vifi, int assert)
+static int ipmr_cache_report(struct net *net,
+                            struct sk_buff *pkt, vifi_t vifi, int assert)

 {
        struct sk_buff *skb;
        const int ihl = ip_hdrlen(pkt);
 {
        struct sk_buff *skb;
        const int ihl = ip_hdrlen(pkt);


@@ -578,7 +634,7 @@ static int ipmr_cache_report(struct sk_buff *pkt, vifi_t vifi, int assert)
                memcpy(msg, skb_network_header(pkt), sizeof(struct iphdr));
                msg->im_msgtype = IGMPMSG_WHOLEPKT;
                msg->im_mbz = 0;
                memcpy(msg, skb_network_header(pkt), sizeof(struct iphdr));
                msg->im_msgtype = IGMPMSG_WHOLEPKT;
                msg->im_mbz = 0;

-               msg->im_vif = reg_vif_num;
+               msg->im_vif = net->ipv4.mroute_reg_vif_num;

                ip_hdr(skb)->ihl = sizeof(struct iphdr) >> 2;
                ip_hdr(skb)->tot_len = htons(ntohs(ip_hdr(pkt)->tot_len) +
                                             sizeof(struct iphdr));
                ip_hdr(skb)->ihl = sizeof(struct iphdr) >> 2;
                ip_hdr(skb)->tot_len = htons(ntohs(ip_hdr(pkt)->tot_len) +
                                             sizeof(struct iphdr));


@@ -596,13 +652,13 @@ static int ipmr_cache_report(struct sk_buff *pkt, vifi_t vifi, int assert)
        ip_hdr(skb)->protocol = 0;                      /* Flag to the kernel this is a route add */
        msg = (struct igmpmsg *)skb_network_header(skb);
        msg->im_vif = vifi;
        ip_hdr(skb)->protocol = 0;                      /* Flag to the kernel this is a route add */
        msg = (struct igmpmsg *)skb_network_header(skb);
        msg->im_vif = vifi;

-       skb->dst = dst_clone(pkt->dst);
+       skb_dst_set(skb, dst_clone(skb_dst(pkt)));

 
        /*
         *      Add our header
         */
 
 
        /*
         *      Add our header
         */
 

-       igmp=(struct igmphdr *)skb_put(skb,sizeof(struct igmphdr));
+       igmp=(struct igmphdr *)skb_put(skb, sizeof(struct igmphdr));

        igmp->type      =
        msg->im_msgtype = assert;
        igmp->code      =       0;
        igmp->type      =
        msg->im_msgtype = assert;
        igmp->code      =       0;


@@ -610,7 +666,7 @@ static int ipmr_cache_report(struct sk_buff *pkt, vifi_t vifi, int assert)
        skb->transport_header = skb->network_header;
        }
 
        skb->transport_header = skb->network_header;
        }
 

-       if (mroute_socket == NULL) {
+       if (net->ipv4.mroute_sk == NULL) {

                kfree_skb(skb);
                return -EINVAL;
        }
                kfree_skb(skb);
                return -EINVAL;
        }


@@ -618,7 +674,8 @@ static int ipmr_cache_report(struct sk_buff *pkt, vifi_t vifi, int assert)
        /*
         *      Deliver to mrouted
         */
        /*
         *      Deliver to mrouted
         */

-       if ((ret=sock_queue_rcv_skb(mroute_socket,skb))<0) {
+       ret = sock_queue_rcv_skb(net->ipv4.mroute_sk, skb);
+       if (ret < 0) {

                if (net_ratelimit())
                        printk(KERN_WARNING "mroute: pending queue full, dropping entries.\n");
                kfree_skb(skb);
                if (net_ratelimit())
                        printk(KERN_WARNING "mroute: pending queue full, dropping entries.\n");
                kfree_skb(skb);


@@ -632,7 +689,7 @@ static int ipmr_cache_report(struct sk_buff *pkt, vifi_t vifi, int assert)
  */
 
 static int
  */
 
 static int

-ipmr_cache_unresolved(vifi_t vifi, struct sk_buff *skb)
+ipmr_cache_unresolved(struct net *net, vifi_t vifi, struct sk_buff *skb)

 {
        int err;
        struct mfc_cache *c;
 {
        int err;
        struct mfc_cache *c;


@@ -640,7 +697,8 @@ ipmr_cache_unresolved(vifi_t vifi, struct sk_buff *skb)
 
        spin_lock_bh(&mfc_unres_lock);
        for (c=mfc_unres_queue; c; c=c->next) {
 
        spin_lock_bh(&mfc_unres_lock);
        for (c=mfc_unres_queue; c; c=c->next) {

-               if (c->mfc_mcastgrp == iph->daddr &&
+               if (net_eq(mfc_net(c), net) &&
+                   c->mfc_mcastgrp == iph->daddr &&

                    c->mfc_origin == iph->saddr)
                        break;
        }
                    c->mfc_origin == iph->saddr)
                        break;
        }


@@ -650,8 +708,8 @@ ipmr_cache_unresolved(vifi_t vifi, struct sk_buff *skb)
                 *      Create a new entry if allowable
                 */
 
                 *      Create a new entry if allowable
                 */
 

-               if (atomic_read(&cache_resolve_queue_len)>=10 ||
-                   (c=ipmr_cache_alloc_unres())==NULL) {
+               if (atomic_read(&net->ipv4.cache_resolve_queue_len) >= 10 ||
+                   (c = ipmr_cache_alloc_unres(net)) == NULL) {

                        spin_unlock_bh(&mfc_unres_lock);
 
                        kfree_skb(skb);
                        spin_unlock_bh(&mfc_unres_lock);
 
                        kfree_skb(skb);


@@ -668,18 +726,19 @@ ipmr_cache_unresolved(vifi_t vifi, struct sk_buff *skb)
                /*
                 *      Reflect first query at mrouted.
                 */
                /*
                 *      Reflect first query at mrouted.
                 */

-               if ((err = ipmr_cache_report(skb, vifi, IGMPMSG_NOCACHE))<0) {
+               err = ipmr_cache_report(net, skb, vifi, IGMPMSG_NOCACHE);
+               if (err < 0) {

                        /* If the report failed throw the cache entry
                           out - Brad Parker
                         */
                        spin_unlock_bh(&mfc_unres_lock);
 
                        /* If the report failed throw the cache entry
                           out - Brad Parker
                         */
                        spin_unlock_bh(&mfc_unres_lock);
 

-                       kmem_cache_free(mrt_cachep, c);
+                       ipmr_cache_free(c);

                        kfree_skb(skb);
                        return err;
                }
 
                        kfree_skb(skb);
                        return err;
                }
 

-               atomic_inc(&cache_resolve_queue_len);
+               atomic_inc(&net->ipv4.cache_resolve_queue_len);

                c->next = mfc_unres_queue;
                mfc_unres_queue = c;
 
                c->next = mfc_unres_queue;
                mfc_unres_queue = c;
 


@@ -693,7 +752,7 @@ ipmr_cache_unresolved(vifi_t vifi, struct sk_buff *skb)
                kfree_skb(skb);
                err = -ENOBUFS;
        } else {
                kfree_skb(skb);
                err = -ENOBUFS;
        } else {

-               skb_queue_tail(&c->mfc_un.unres.unresolved,skb);
+               skb_queue_tail(&c->mfc_un.unres.unresolved, skb);

                err = 0;
        }
 
                err = 0;
        }
 


@@ -705,35 +764,37 @@ ipmr_cache_unresolved(vifi_t vifi, struct sk_buff *skb)
  *     MFC cache manipulation by user space mroute daemon
  */
 
  *     MFC cache manipulation by user space mroute daemon
  */
 

-static int ipmr_mfc_delete(struct mfcctl *mfc)
+static int ipmr_mfc_delete(struct net *net, struct mfcctl *mfc)

 {
        int line;
        struct mfc_cache *c, **cp;
 
 {
        int line;
        struct mfc_cache *c, **cp;
 

-       line=MFC_HASH(mfc->mfcc_mcastgrp.s_addr, mfc->mfcc_origin.s_addr);
+       line = MFC_HASH(mfc->mfcc_mcastgrp.s_addr, mfc->mfcc_origin.s_addr);

 
 

-       for (cp=&mfc_cache_array[line]; (c=*cp) != NULL; cp = &c->next) {
+       for (cp = &net->ipv4.mfc_cache_array[line];
+            (c = *cp) != NULL; cp = &c->next) {

                if (c->mfc_origin == mfc->mfcc_origin.s_addr &&
                    c->mfc_mcastgrp == mfc->mfcc_mcastgrp.s_addr) {
                        write_lock_bh(&mrt_lock);
                        *cp = c->next;
                        write_unlock_bh(&mrt_lock);
 
                if (c->mfc_origin == mfc->mfcc_origin.s_addr &&
                    c->mfc_mcastgrp == mfc->mfcc_mcastgrp.s_addr) {
                        write_lock_bh(&mrt_lock);
                        *cp = c->next;
                        write_unlock_bh(&mrt_lock);
 

-                       kmem_cache_free(mrt_cachep, c);
+                       ipmr_cache_free(c);

                        return 0;
                }
        }
        return -ENOENT;
 }
 
                        return 0;
                }
        }
        return -ENOENT;
 }
 

-static int ipmr_mfc_add(struct mfcctl *mfc, int mrtsock)
+static int ipmr_mfc_add(struct net *net, struct mfcctl *mfc, int mrtsock)

 {
        int line;
        struct mfc_cache *uc, *c, **cp;
 
 {
        int line;
        struct mfc_cache *uc, *c, **cp;
 

-       line=MFC_HASH(mfc->mfcc_mcastgrp.s_addr, mfc->mfcc_origin.s_addr);
+       line = MFC_HASH(mfc->mfcc_mcastgrp.s_addr, mfc->mfcc_origin.s_addr);

 
 

-       for (cp=&mfc_cache_array[line]; (c=*cp) != NULL; cp = &c->next) {
+       for (cp = &net->ipv4.mfc_cache_array[line];
+            (c = *cp) != NULL; cp = &c->next) {

                if (c->mfc_origin == mfc->mfcc_origin.s_addr &&
                    c->mfc_mcastgrp == mfc->mfcc_mcastgrp.s_addr)
                        break;
                if (c->mfc_origin == mfc->mfcc_origin.s_addr &&
                    c->mfc_mcastgrp == mfc->mfcc_mcastgrp.s_addr)
                        break;


@@ -752,20 +813,20 @@ static int ipmr_mfc_add(struct mfcctl *mfc, int mrtsock)
        if (!ipv4_is_multicast(mfc->mfcc_mcastgrp.s_addr))
                return -EINVAL;
 
        if (!ipv4_is_multicast(mfc->mfcc_mcastgrp.s_addr))
                return -EINVAL;
 

-       c=ipmr_cache_alloc();
-       if (c==NULL)
+       c = ipmr_cache_alloc(net);
+       if (c == NULL)

                return -ENOMEM;
 
                return -ENOMEM;
 

-       c->mfc_origin=mfc->mfcc_origin.s_addr;
-       c->mfc_mcastgrp=mfc->mfcc_mcastgrp.s_addr;
-       c->mfc_parent=mfc->mfcc_parent;
+       c->mfc_origin = mfc->mfcc_origin.s_addr;
+       c->mfc_mcastgrp = mfc->mfcc_mcastgrp.s_addr;
+       c->mfc_parent = mfc->mfcc_parent;

        ipmr_update_thresholds(c, mfc->mfcc_ttls);
        if (!mrtsock)
                c->mfc_flags |= MFC_STATIC;
 
        write_lock_bh(&mrt_lock);
        ipmr_update_thresholds(c, mfc->mfcc_ttls);
        if (!mrtsock)
                c->mfc_flags |= MFC_STATIC;
 
        write_lock_bh(&mrt_lock);

-       c->next = mfc_cache_array[line];
-       mfc_cache_array[line] = c;
+       c->next = net->ipv4.mfc_cache_array[line];
+       net->ipv4.mfc_cache_array[line] = c;

        write_unlock_bh(&mrt_lock);
 
        /*
        write_unlock_bh(&mrt_lock);
 
        /*


@@ -775,19 +836,21 @@ static int ipmr_mfc_add(struct mfcctl *mfc, int mrtsock)
        spin_lock_bh(&mfc_unres_lock);
        for (cp = &mfc_unres_queue; (uc=*cp) != NULL;
             cp = &uc->next) {
        spin_lock_bh(&mfc_unres_lock);
        for (cp = &mfc_unres_queue; (uc=*cp) != NULL;
             cp = &uc->next) {

-               if (uc->mfc_origin == c->mfc_origin &&
+               if (net_eq(mfc_net(uc), net) &&
+                   uc->mfc_origin == c->mfc_origin &&

                    uc->mfc_mcastgrp == c->mfc_mcastgrp) {
                        *cp = uc->next;
                    uc->mfc_mcastgrp == c->mfc_mcastgrp) {
                        *cp = uc->next;

-                       if (atomic_dec_and_test(&cache_resolve_queue_len))
-                               del_timer(&ipmr_expire_timer);
+                       atomic_dec(&net->ipv4.cache_resolve_queue_len);

                        break;
                }
        }
                        break;
                }
        }

+       if (mfc_unres_queue == NULL)
+               del_timer(&ipmr_expire_timer);

        spin_unlock_bh(&mfc_unres_lock);
 
        if (uc) {
                ipmr_cache_resolve(uc, c);
        spin_unlock_bh(&mfc_unres_lock);
 
        if (uc) {
                ipmr_cache_resolve(uc, c);

-               kmem_cache_free(mrt_cachep, uc);
+               ipmr_cache_free(uc);

        }
        return 0;
 }
        }
        return 0;
 }


@@ -796,25 +859,25 @@ static int ipmr_mfc_add(struct mfcctl *mfc, int mrtsock)
  *     Close the multicast socket, and clear the vif tables etc
  */
 
  *     Close the multicast socket, and clear the vif tables etc
  */
 

-static void mroute_clean_tables(struct sock *sk)
+static void mroute_clean_tables(struct net *net)

 {
        int i;
 
        /*
         *      Shut down all active vif entries
         */
 {
        int i;
 
        /*
         *      Shut down all active vif entries
         */

-       for (i=0; i<maxvif; i++) {
-               if (!(vif_table[i].flags&VIFF_STATIC))
-                       vif_delete(i);
+       for (i = 0; i < net->ipv4.maxvif; i++) {
+               if (!(net->ipv4.vif_table[i].flags&VIFF_STATIC))
+                       vif_delete(net, i, 0);

        }
 
        /*
         *      Wipe the cache
         */
        }
 
        /*
         *      Wipe the cache
         */

-       for (i=0;i<MFC_LINES;i++) {
+       for (i=0; i<MFC_LINES; i++) {

                struct mfc_cache *c, **cp;
 
                struct mfc_cache *c, **cp;
 

-               cp = &mfc_cache_array[i];
+               cp = &net->ipv4.mfc_cache_array[i];

                while ((c = *cp) != NULL) {
                        if (c->mfc_flags&MFC_STATIC) {
                                cp = &c->next;
                while ((c = *cp) != NULL) {
                        if (c->mfc_flags&MFC_STATIC) {
                                cp = &c->next;


@@ -824,22 +887,23 @@ static void mroute_clean_tables(struct sock *sk)
                        *cp = c->next;
                        write_unlock_bh(&mrt_lock);
 
                        *cp = c->next;
                        write_unlock_bh(&mrt_lock);
 

-                       kmem_cache_free(mrt_cachep, c);
+                       ipmr_cache_free(c);

                }
        }
 
                }
        }
 

-       if (atomic_read(&cache_resolve_queue_len) != 0) {
-               struct mfc_cache *c;
+       if (atomic_read(&net->ipv4.cache_resolve_queue_len) != 0) {
+               struct mfc_cache *c, **cp;

 
                spin_lock_bh(&mfc_unres_lock);
 
                spin_lock_bh(&mfc_unres_lock);

-               while (mfc_unres_queue != NULL) {
-                       c = mfc_unres_queue;
-                       mfc_unres_queue = c->next;
-                       spin_unlock_bh(&mfc_unres_lock);
+               cp = &mfc_unres_queue;
+               while ((c = *cp) != NULL) {
+                       if (!net_eq(mfc_net(c), net)) {
+                               cp = &c->next;
+                               continue;
+                       }
+                       *cp = c->next;

 
                        ipmr_destroy_unres(c);
 
                        ipmr_destroy_unres(c);

-
-                       spin_lock_bh(&mfc_unres_lock);

                }
                spin_unlock_bh(&mfc_unres_lock);
        }
                }
                spin_unlock_bh(&mfc_unres_lock);
        }


@@ -847,15 +911,17 @@ static void mroute_clean_tables(struct sock *sk)
 
 static void mrtsock_destruct(struct sock *sk)
 {
 
 static void mrtsock_destruct(struct sock *sk)
 {

+       struct net *net = sock_net(sk);
+

        rtnl_lock();
        rtnl_lock();

-       if (sk == mroute_socket) {
-               IPV4_DEVCONF_ALL(sock_net(sk), MC_FORWARDING)--;
+       if (sk == net->ipv4.mroute_sk) {
+               IPV4_DEVCONF_ALL(net, MC_FORWARDING)--;

 
                write_lock_bh(&mrt_lock);
 
                write_lock_bh(&mrt_lock);

-               mroute_socket=NULL;
+               net->ipv4.mroute_sk = NULL;

                write_unlock_bh(&mrt_lock);
 
                write_unlock_bh(&mrt_lock);
 

-               mroute_clean_tables(sk);
+               mroute_clean_tables(net);

        }
        rtnl_unlock();
 }
        }
        rtnl_unlock();
 }


@@ -867,14 +933,15 @@ static void mrtsock_destruct(struct sock *sk)
  *     MOSPF/PIM router set up we can clean this up.
  */
 
  *     MOSPF/PIM router set up we can clean this up.
  */
 

-int ip_mroute_setsockopt(struct sock *sk,int optname,char __user *optval,int optlen)
+int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, unsigned int optlen)

 {
        int ret;
        struct vifctl vif;
        struct mfcctl mfc;
 {
        int ret;
        struct vifctl vif;
        struct mfcctl mfc;

+       struct net *net = sock_net(sk);

 
        if (optname != MRT_INIT) {
 
        if (optname != MRT_INIT) {

-               if (sk != mroute_socket && !capable(CAP_NET_ADMIN))
+               if (sk != net->ipv4.mroute_sk && !capable(CAP_NET_ADMIN))

                        return -EACCES;
        }
 
                        return -EACCES;
        }
 


@@ -883,11 +950,11 @@ int ip_mroute_setsockopt(struct sock *sk,int optname,char __user *optval,int opt
                if (sk->sk_type != SOCK_RAW ||
                    inet_sk(sk)->num != IPPROTO_IGMP)
                        return -EOPNOTSUPP;
                if (sk->sk_type != SOCK_RAW ||
                    inet_sk(sk)->num != IPPROTO_IGMP)
                        return -EOPNOTSUPP;

-               if (optlen!=sizeof(int))
+               if (optlen != sizeof(int))

                        return -ENOPROTOOPT;
 
                rtnl_lock();
                        return -ENOPROTOOPT;
 
                rtnl_lock();

-               if (mroute_socket) {
+               if (net->ipv4.mroute_sk) {

                        rtnl_unlock();
                        return -EADDRINUSE;
                }
                        rtnl_unlock();
                        return -EADDRINUSE;
                }


@@ -895,30 +962,30 @@ int ip_mroute_setsockopt(struct sock *sk,int optname,char __user *optval,int opt
                ret = ip_ra_control(sk, 1, mrtsock_destruct);
                if (ret == 0) {
                        write_lock_bh(&mrt_lock);
                ret = ip_ra_control(sk, 1, mrtsock_destruct);
                if (ret == 0) {
                        write_lock_bh(&mrt_lock);

-                       mroute_socket=sk;
+                       net->ipv4.mroute_sk = sk;

                        write_unlock_bh(&mrt_lock);
 
                        write_unlock_bh(&mrt_lock);
 

-                       IPV4_DEVCONF_ALL(sock_net(sk), MC_FORWARDING)++;
+                       IPV4_DEVCONF_ALL(net, MC_FORWARDING)++;

                }
                rtnl_unlock();
                return ret;
        case MRT_DONE:
                }
                rtnl_unlock();
                return ret;
        case MRT_DONE:

-               if (sk!=mroute_socket)
+               if (sk != net->ipv4.mroute_sk)

                        return -EACCES;
                return ip_ra_control(sk, 0, NULL);
        case MRT_ADD_VIF:
        case MRT_DEL_VIF:
                        return -EACCES;
                return ip_ra_control(sk, 0, NULL);
        case MRT_ADD_VIF:
        case MRT_DEL_VIF:

-               if (optlen!=sizeof(vif))
+               if (optlen != sizeof(vif))

                        return -EINVAL;
                        return -EINVAL;

-               if (copy_from_user(&vif,optval,sizeof(vif)))
+               if (copy_from_user(&vif, optval, sizeof(vif)))

                        return -EFAULT;
                if (vif.vifc_vifi >= MAXVIFS)
                        return -ENFILE;
                rtnl_lock();
                        return -EFAULT;
                if (vif.vifc_vifi >= MAXVIFS)
                        return -ENFILE;
                rtnl_lock();

-               if (optname==MRT_ADD_VIF) {
-                       ret = vif_add(&vif, sk==mroute_socket);
+               if (optname == MRT_ADD_VIF) {
+                       ret = vif_add(net, &vif, sk == net->ipv4.mroute_sk);

                } else {
                } else {

-                       ret = vif_delete(vif.vifc_vifi);
+                       ret = vif_delete(net, vif.vifc_vifi, 0);

                }
                rtnl_unlock();
                return ret;
                }
                rtnl_unlock();
                return ret;


@@ -929,15 +996,15 @@ int ip_mroute_setsockopt(struct sock *sk,int optname,char __user *optval,int opt
                 */
        case MRT_ADD_MFC:
        case MRT_DEL_MFC:
                 */
        case MRT_ADD_MFC:
        case MRT_DEL_MFC:

-               if (optlen!=sizeof(mfc))
+               if (optlen != sizeof(mfc))

                        return -EINVAL;
                        return -EINVAL;

-               if (copy_from_user(&mfc,optval, sizeof(mfc)))
+               if (copy_from_user(&mfc, optval, sizeof(mfc)))

                        return -EFAULT;
                rtnl_lock();
                        return -EFAULT;
                rtnl_lock();

-               if (optname==MRT_DEL_MFC)
-                       ret = ipmr_mfc_delete(&mfc);
+               if (optname == MRT_DEL_MFC)
+                       ret = ipmr_mfc_delete(net, &mfc);

                else
                else

-                       ret = ipmr_mfc_add(&mfc, sk==mroute_socket);
+                       ret = ipmr_mfc_add(net, &mfc, sk == net->ipv4.mroute_sk);

                rtnl_unlock();
                return ret;
                /*
                rtnl_unlock();
                return ret;
                /*


@@ -948,7 +1015,7 @@ int ip_mroute_setsockopt(struct sock *sk,int optname,char __user *optval,int opt
                int v;
                if (get_user(v,(int __user *)optval))
                        return -EFAULT;
                int v;
                if (get_user(v,(int __user *)optval))
                        return -EFAULT;

-               mroute_do_assert=(v)?1:0;
+               net->ipv4.mroute_do_assert = (v) ? 1 : 0;

                return 0;
        }
 #ifdef CONFIG_IP_PIMSM
                return 0;
        }
 #ifdef CONFIG_IP_PIMSM


@@ -962,19 +1029,9 @@ int ip_mroute_setsockopt(struct sock *sk,int optname,char __user *optval,int opt
 
                rtnl_lock();
                ret = 0;
 
                rtnl_lock();
                ret = 0;

-               if (v != mroute_do_pim) {
-                       mroute_do_pim = v;
-                       mroute_do_assert = v;
-#ifdef CONFIG_IP_PIMSM_V2
-                       if (mroute_do_pim)
-                               ret = inet_add_protocol(&pim_protocol,
-                                                       IPPROTO_PIM);
-                       else
-                               ret = inet_del_protocol(&pim_protocol,
-                                                       IPPROTO_PIM);
-                       if (ret < 0)
-                               ret = -EAGAIN;
-#endif
+               if (v != net->ipv4.mroute_do_pim) {
+                       net->ipv4.mroute_do_pim = v;
+                       net->ipv4.mroute_do_assert = v;

                }
                rtnl_unlock();
                return ret;
                }
                rtnl_unlock();
                return ret;


@@ -993,12 +1050,13 @@ int ip_mroute_setsockopt(struct sock *sk,int optname,char __user *optval,int opt
  *     Getsock opt support for the multicast routing system.
  */
 
  *     Getsock opt support for the multicast routing system.
  */
 

-int ip_mroute_getsockopt(struct sock *sk,int optname,char __user *optval,int __user *optlen)
+int ip_mroute_getsockopt(struct sock *sk, int optname, char __user *optval, int __user *optlen)

 {
        int olr;
        int val;
 {
        int olr;
        int val;

+       struct net *net = sock_net(sk);

 
 

-       if (optname!=MRT_VERSION &&
+       if (optname != MRT_VERSION &&

 #ifdef CONFIG_IP_PIMSM
           optname!=MRT_PIM &&
 #endif
 #ifdef CONFIG_IP_PIMSM
           optname!=MRT_PIM &&
 #endif


@@ -1012,17 +1070,17 @@ int ip_mroute_getsockopt(struct sock *sk,int optname,char __user *optval,int __u
        if (olr < 0)
                return -EINVAL;
 
        if (olr < 0)
                return -EINVAL;
 

-       if (put_user(olr,optlen))
+       if (put_user(olr, optlen))

                return -EFAULT;
                return -EFAULT;

-       if (optname==MRT_VERSION)
-               val=0x0305;
+       if (optname == MRT_VERSION)
+               val = 0x0305;

 #ifdef CONFIG_IP_PIMSM
 #ifdef CONFIG_IP_PIMSM

-       else if (optname==MRT_PIM)
-               val=mroute_do_pim;
+       else if (optname == MRT_PIM)
+               val = net->ipv4.mroute_do_pim;

 #endif
        else
 #endif
        else

-               val=mroute_do_assert;
-       if (copy_to_user(optval,&val,olr))
+               val = net->ipv4.mroute_do_assert;
+       if (copy_to_user(optval, &val, olr))

                return -EFAULT;
        return 0;
 }
                return -EFAULT;
        return 0;
 }


@@ -1037,41 +1095,42 @@ int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg)
        struct sioc_vif_req vr;
        struct vif_device *vif;
        struct mfc_cache *c;
        struct sioc_vif_req vr;
        struct vif_device *vif;
        struct mfc_cache *c;

+       struct net *net = sock_net(sk);

 
        switch (cmd) {
        case SIOCGETVIFCNT:
 
        switch (cmd) {
        case SIOCGETVIFCNT:

-               if (copy_from_user(&vr,arg,sizeof(vr)))
+               if (copy_from_user(&vr, arg, sizeof(vr)))

                        return -EFAULT;
                        return -EFAULT;

-               if (vr.vifi>=maxvif)
+               if (vr.vifi >= net->ipv4.maxvif)

                        return -EINVAL;
                read_lock(&mrt_lock);
                        return -EINVAL;
                read_lock(&mrt_lock);

-               vif=&vif_table[vr.vifi];
-               if (VIF_EXISTS(vr.vifi))        {
-                       vr.icount=vif->pkt_in;
-                       vr.ocount=vif->pkt_out;
-                       vr.ibytes=vif->bytes_in;
-                       vr.obytes=vif->bytes_out;
+               vif = &net->ipv4.vif_table[vr.vifi];
+               if (VIF_EXISTS(net, vr.vifi)) {
+                       vr.icount = vif->pkt_in;
+                       vr.ocount = vif->pkt_out;
+                       vr.ibytes = vif->bytes_in;
+                       vr.obytes = vif->bytes_out;

                        read_unlock(&mrt_lock);
 
                        read_unlock(&mrt_lock);
 

-                       if (copy_to_user(arg,&vr,sizeof(vr)))
+                       if (copy_to_user(arg, &vr, sizeof(vr)))

                                return -EFAULT;
                        return 0;
                }
                read_unlock(&mrt_lock);
                return -EADDRNOTAVAIL;
        case SIOCGETSGCNT:
                                return -EFAULT;
                        return 0;
                }
                read_unlock(&mrt_lock);
                return -EADDRNOTAVAIL;
        case SIOCGETSGCNT:

-               if (copy_from_user(&sr,arg,sizeof(sr)))
+               if (copy_from_user(&sr, arg, sizeof(sr)))

                        return -EFAULT;
 
                read_lock(&mrt_lock);
                        return -EFAULT;
 
                read_lock(&mrt_lock);

-               c = ipmr_cache_find(sr.src.s_addr, sr.grp.s_addr);
+               c = ipmr_cache_find(net, sr.src.s_addr, sr.grp.s_addr);

                if (c) {
                        sr.pktcnt = c->mfc_un.res.pkt;
                        sr.bytecnt = c->mfc_un.res.bytes;
                        sr.wrong_if = c->mfc_un.res.wrong_if;
                        read_unlock(&mrt_lock);
 
                if (c) {
                        sr.pktcnt = c->mfc_un.res.pkt;
                        sr.bytecnt = c->mfc_un.res.bytes;
                        sr.wrong_if = c->mfc_un.res.wrong_if;
                        read_unlock(&mrt_lock);
 

-                       if (copy_to_user(arg,&sr,sizeof(sr)))
+                       if (copy_to_user(arg, &sr, sizeof(sr)))

                                return -EFAULT;
                        return 0;
                }
                                return -EFAULT;
                        return 0;
                }


@@ -1086,24 +1145,25 @@ int ipmr_ioctl(struct sock *sk, int cmd, void __user *arg)
 static int ipmr_device_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
        struct net_device *dev = ptr;
 static int ipmr_device_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
        struct net_device *dev = ptr;

+       struct net *net = dev_net(dev);

        struct vif_device *v;
        int ct;
 
        struct vif_device *v;
        int ct;
 

-       if (dev_net(dev) != &init_net)
+       if (!net_eq(dev_net(dev), net))

                return NOTIFY_DONE;
 
        if (event != NETDEV_UNREGISTER)
                return NOTIFY_DONE;
                return NOTIFY_DONE;
 
        if (event != NETDEV_UNREGISTER)
                return NOTIFY_DONE;

-       v=&vif_table[0];
-       for (ct=0;ct<maxvif;ct++,v++) {
-               if (v->dev==dev)
-                       vif_delete(ct);
+       v = &net->ipv4.vif_table[0];
+       for (ct = 0; ct < net->ipv4.maxvif; ct++, v++) {
+               if (v->dev == dev)
+                       vif_delete(net, ct, 1);

        }
        return NOTIFY_DONE;
 }
 
 
        }
        return NOTIFY_DONE;
 }
 
 

-static struct notifier_block ip_mr_notifier={
+static struct notifier_block ip_mr_notifier = {

        .notifier_call = ipmr_device_event,
 };
 
        .notifier_call = ipmr_device_event,
 };
 


@@ -1132,7 +1192,7 @@ static void ip_encap(struct sk_buff *skb, __be32 saddr, __be32 daddr)
        iph->protocol   =       IPPROTO_IPIP;
        iph->ihl        =       5;
        iph->tot_len    =       htons(skb->len);
        iph->protocol   =       IPPROTO_IPIP;
        iph->ihl        =       5;
        iph->tot_len    =       htons(skb->len);

-       ip_select_ident(iph, skb->dst, NULL);
+       ip_select_ident(iph, skb_dst(skb), NULL);

        ip_send_check(iph);
 
        memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));
        ip_send_check(iph);
 
        memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));


@@ -1143,7 +1203,7 @@ static inline int ipmr_forward_finish(struct sk_buff *skb)
 {
        struct ip_options * opt = &(IPCB(skb)->opt);
 
 {
        struct ip_options * opt = &(IPCB(skb)->opt);
 

-       IP_INC_STATS_BH(IPSTATS_MIB_OUTFORWDATAGRAMS);
+       IP_INC_STATS_BH(dev_net(skb_dst(skb)->dev), IPSTATS_MIB_OUTFORWDATAGRAMS);

 
        if (unlikely(opt->optlen))
                ip_forward_options(skb);
 
        if (unlikely(opt->optlen))
                ip_forward_options(skb);


@@ -1157,8 +1217,9 @@ static inline int ipmr_forward_finish(struct sk_buff *skb)
 
 static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi)
 {
 
 static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi)
 {

+       struct net *net = mfc_net(c);

        const struct iphdr *iph = ip_hdr(skb);
        const struct iphdr *iph = ip_hdr(skb);

-       struct vif_device *vif = &vif_table[vifi];
+       struct vif_device *vif = &net->ipv4.vif_table[vifi];

        struct net_device *dev;
        struct rtable *rt;
        int    encap = 0;
        struct net_device *dev;
        struct rtable *rt;
        int    encap = 0;


@@ -1169,12 +1230,11 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi)
 #ifdef CONFIG_IP_PIMSM
        if (vif->flags & VIFF_REGISTER) {
                vif->pkt_out++;
 #ifdef CONFIG_IP_PIMSM
        if (vif->flags & VIFF_REGISTER) {
                vif->pkt_out++;

-               vif->bytes_out+=skb->len;
-               ((struct net_device_stats*)netdev_priv(vif->dev))->tx_bytes += skb->len;
-               ((struct net_device_stats*)netdev_priv(vif->dev))->tx_packets++;
-               ipmr_cache_report(skb, vifi, IGMPMSG_WHOLEPKT);
-               kfree_skb(skb);
-               return;
+               vif->bytes_out += skb->len;
+               vif->dev->stats.tx_bytes += skb->len;
+               vif->dev->stats.tx_packets++;
+               ipmr_cache_report(net, skb, vifi, IGMPMSG_WHOLEPKT);
+               goto out_free;

        }
 #endif
 
        }
 #endif
 


@@ -1185,7 +1245,7 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi)
                                                .saddr = vif->local,
                                                .tos = RT_TOS(iph->tos) } },
                                    .proto = IPPROTO_IPIP };
                                                .saddr = vif->local,
                                                .tos = RT_TOS(iph->tos) } },
                                    .proto = IPPROTO_IPIP };

-               if (ip_route_output_key(&init_net, &rt, &fl))
+               if (ip_route_output_key(net, &rt, &fl))

                        goto out_free;
                encap = sizeof(struct iphdr);
        } else {
                        goto out_free;
                encap = sizeof(struct iphdr);
        } else {


@@ -1194,7 +1254,7 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi)
                                              { .daddr = iph->daddr,
                                                .tos = RT_TOS(iph->tos) } },
                                    .proto = IPPROTO_IPIP };
                                              { .daddr = iph->daddr,
                                                .tos = RT_TOS(iph->tos) } },
                                    .proto = IPPROTO_IPIP };

-               if (ip_route_output_key(&init_net, &rt, &fl))
+               if (ip_route_output_key(net, &rt, &fl))

                        goto out_free;
        }
 
                        goto out_free;
        }
 


@@ -1206,7 +1266,7 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi)
                   to blackhole.
                 */
 
                   to blackhole.
                 */
 

-               IP_INC_STATS_BH(IPSTATS_MIB_FRAGFAILS);
+               IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_FRAGFAILS);

                ip_rt_put(rt);
                goto out_free;
        }
                ip_rt_put(rt);
                goto out_free;
        }


@@ -1219,10 +1279,10 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi)
        }
 
        vif->pkt_out++;
        }
 
        vif->pkt_out++;

-       vif->bytes_out+=skb->len;
+       vif->bytes_out += skb->len;

 
 

-       dst_release(skb->dst);
-       skb->dst = &rt->u.dst;
+       skb_dst_drop(skb);
+       skb_dst_set(skb, &rt->u.dst);

        ip_decrease_ttl(ip_hdr(skb));
 
        /* FIXME: forward and output firewalls used to be called here.
        ip_decrease_ttl(ip_hdr(skb));
 
        /* FIXME: forward and output firewalls used to be called here.


@@ -1258,9 +1318,10 @@ out_free:
 
 static int ipmr_find_vif(struct net_device *dev)
 {
 
 static int ipmr_find_vif(struct net_device *dev)
 {

+       struct net *net = dev_net(dev);

        int ct;
        int ct;

-       for (ct=maxvif-1; ct>=0; ct--) {
-               if (vif_table[ct].dev == dev)
+       for (ct = net->ipv4.maxvif-1; ct >= 0; ct--) {
+               if (net->ipv4.vif_table[ct].dev == dev)

                        break;
        }
        return ct;
                        break;
        }
        return ct;


@@ -1272,6 +1333,7 @@ static int ip_mr_forward(struct sk_buff *skb, struct mfc_cache *cache, int local
 {
        int psend = -1;
        int vif, ct;
 {
        int psend = -1;
        int vif, ct;

+       struct net *net = mfc_net(cache);

 
        vif = cache->mfc_parent;
        cache->mfc_un.res.pkt++;
 
        vif = cache->mfc_parent;
        cache->mfc_un.res.pkt++;


@@ -1280,10 +1342,10 @@ static int ip_mr_forward(struct sk_buff *skb, struct mfc_cache *cache, int local
        /*
         * Wrong interface: drop packet and (maybe) send PIM assert.
         */
        /*
         * Wrong interface: drop packet and (maybe) send PIM assert.
         */

-       if (vif_table[vif].dev != skb->dev) {
+       if (net->ipv4.vif_table[vif].dev != skb->dev) {

                int true_vifi;
 
                int true_vifi;
 

-               if (skb->rtable->fl.iif == 0) {
+               if (skb_rtable(skb)->fl.iif == 0) {

                        /* It is our own packet, looped back.
                           Very complicated situation...
 
                        /* It is our own packet, looped back.
                           Very complicated situation...
 


@@ -1301,23 +1363,24 @@ static int ip_mr_forward(struct sk_buff *skb, struct mfc_cache *cache, int local
                cache->mfc_un.res.wrong_if++;
                true_vifi = ipmr_find_vif(skb->dev);
 
                cache->mfc_un.res.wrong_if++;
                true_vifi = ipmr_find_vif(skb->dev);
 

-               if (true_vifi >= 0 && mroute_do_assert &&
+               if (true_vifi >= 0 && net->ipv4.mroute_do_assert &&

                    /* pimsm uses asserts, when switching from RPT to SPT,
                       so that we cannot check that packet arrived on an oif.
                       It is bad, but otherwise we would need to move pretty
                       large chunk of pimd to kernel. Ough... --ANK
                     */
                    /* pimsm uses asserts, when switching from RPT to SPT,
                       so that we cannot check that packet arrived on an oif.
                       It is bad, but otherwise we would need to move pretty
                       large chunk of pimd to kernel. Ough... --ANK
                     */

-                   (mroute_do_pim || cache->mfc_un.res.ttls[true_vifi] < 255) &&
+                   (net->ipv4.mroute_do_pim ||
+                    cache->mfc_un.res.ttls[true_vifi] < 255) &&

                    time_after(jiffies,
                               cache->mfc_un.res.last_assert + MFC_ASSERT_THRESH)) {
                        cache->mfc_un.res.last_assert = jiffies;
                    time_after(jiffies,
                               cache->mfc_un.res.last_assert + MFC_ASSERT_THRESH)) {
                        cache->mfc_un.res.last_assert = jiffies;

-                       ipmr_cache_report(skb, true_vifi, IGMPMSG_WRONGVIF);
+                       ipmr_cache_report(net, skb, true_vifi, IGMPMSG_WRONGVIF);

                }
                goto dont_forward;
        }
 
                }
                goto dont_forward;
        }
 

-       vif_table[vif].pkt_in++;
-       vif_table[vif].bytes_in+=skb->len;
+       net->ipv4.vif_table[vif].pkt_in++;
+       net->ipv4.vif_table[vif].bytes_in += skb->len;

 
        /*
         *      Forward the frame
 
        /*
         *      Forward the frame


@@ -1329,7 +1392,7 @@ static int ip_mr_forward(struct sk_buff *skb, struct mfc_cache *cache, int local
                                if (skb2)
                                        ipmr_queue_xmit(skb2, cache, psend);
                        }
                                if (skb2)
                                        ipmr_queue_xmit(skb2, cache, psend);
                        }

-                       psend=ct;
+                       psend = ct;

                }
        }
        if (psend != -1) {
                }
        }
        if (psend != -1) {


@@ -1357,7 +1420,8 @@ dont_forward:
 int ip_mr_input(struct sk_buff *skb)
 {
        struct mfc_cache *cache;
 int ip_mr_input(struct sk_buff *skb)
 {
        struct mfc_cache *cache;

-       int local = skb->rtable->rt_flags&RTCF_LOCAL;
+       struct net *net = dev_net(skb->dev);
+       int local = skb_rtable(skb)->rt_flags & RTCF_LOCAL;

 
        /* Packet is looped back after forward, it should not be
           forwarded second time, but still can be delivered locally.
 
        /* Packet is looped back after forward, it should not be
           forwarded second time, but still can be delivered locally.


@@ -1377,9 +1441,9 @@ int ip_mr_input(struct sk_buff *skb)
                               that we can forward NO IGMP messages.
                             */
                            read_lock(&mrt_lock);
                               that we can forward NO IGMP messages.
                             */
                            read_lock(&mrt_lock);

-                           if (mroute_socket) {
+                           if (net->ipv4.mroute_sk) {

                                    nf_reset(skb);
                                    nf_reset(skb);

-                                   raw_rcv(mroute_socket, skb);
+                                   raw_rcv(net->ipv4.mroute_sk, skb);

                                    read_unlock(&mrt_lock);
                                    return 0;
                            }
                                    read_unlock(&mrt_lock);
                                    return 0;
                            }


@@ -1388,12 +1452,12 @@ int ip_mr_input(struct sk_buff *skb)
        }
 
        read_lock(&mrt_lock);
        }
 
        read_lock(&mrt_lock);

-       cache = ipmr_cache_find(ip_hdr(skb)->saddr, ip_hdr(skb)->daddr);
+       cache = ipmr_cache_find(net, ip_hdr(skb)->saddr, ip_hdr(skb)->daddr);

 
        /*
         *      No usable cache entry
         */
 
        /*
         *      No usable cache entry
         */

-       if (cache==NULL) {
+       if (cache == NULL) {

                int vif;
 
                if (local) {
                int vif;
 
                if (local) {


@@ -1408,7 +1472,7 @@ int ip_mr_input(struct sk_buff *skb)
 
                vif = ipmr_find_vif(skb->dev);
                if (vif >= 0) {
 
                vif = ipmr_find_vif(skb->dev);
                if (vif >= 0) {

-                       int err = ipmr_cache_unresolved(vif, skb);
+                       int err = ipmr_cache_unresolved(net, vif, skb);

                        read_unlock(&mrt_lock);
 
                        return err;
                        read_unlock(&mrt_lock);
 
                        return err;


@@ -1434,29 +1498,14 @@ dont_forward:
        return 0;
 }
 
        return 0;
 }
 

-#ifdef CONFIG_IP_PIMSM_V1
-/*
- * Handle IGMP messages of PIMv1
- */
-
-int pim_rcv_v1(struct sk_buff * skb)
+#ifdef CONFIG_IP_PIMSM
+static int __pim_rcv(struct sk_buff *skb, unsigned int pimlen)

 {
 {

-       struct igmphdr *pim;
-       struct iphdr   *encap;
-       struct net_device  *reg_dev = NULL;
-
-       if (!pskb_may_pull(skb, sizeof(*pim) + sizeof(*encap)))
-               goto drop;
+       struct net_device *reg_dev = NULL;
+       struct iphdr *encap;
+       struct net *net = dev_net(skb->dev);

 
 

-       pim = igmp_hdr(skb);
-
-       if (!mroute_do_pim ||
-           skb->len < sizeof(*pim) + sizeof(*encap) ||
-           pim->group != PIM_V1_VERSION || pim->code != PIM_V1_REGISTER)
-               goto drop;
-
-       encap = (struct iphdr *)(skb_transport_header(skb) +
-                                sizeof(struct igmphdr));
+       encap = (struct iphdr *)(skb_transport_header(skb) + pimlen);

        /*
           Check that:
           a. packet is really destinted to a multicast group
        /*
           Check that:
           a. packet is really destinted to a multicast group


@@ -1465,18 +1514,18 @@ int pim_rcv_v1(struct sk_buff * skb)
         */
        if (!ipv4_is_multicast(encap->daddr) ||
            encap->tot_len == 0 ||
         */
        if (!ipv4_is_multicast(encap->daddr) ||
            encap->tot_len == 0 ||

-           ntohs(encap->tot_len) + sizeof(*pim) > skb->len)
-               goto drop;
+           ntohs(encap->tot_len) + pimlen > skb->len)
+               return 1;

 
        read_lock(&mrt_lock);
 
        read_lock(&mrt_lock);

-       if (reg_vif_num >= 0)
-               reg_dev = vif_table[reg_vif_num].dev;
+       if (net->ipv4.mroute_reg_vif_num >= 0)
+               reg_dev = net->ipv4.vif_table[net->ipv4.mroute_reg_vif_num].dev;

        if (reg_dev)
                dev_hold(reg_dev);
        read_unlock(&mrt_lock);
 
        if (reg_dev == NULL)
        if (reg_dev)
                dev_hold(reg_dev);
        read_unlock(&mrt_lock);
 
        if (reg_dev == NULL)

-               goto drop;
+               return 1;

 
        skb->mac_header = skb->network_header;
        skb_pull(skb, (u8*)encap - skb->data);
 
        skb->mac_header = skb->network_header;
        skb_pull(skb, (u8*)encap - skb->data);


@@ -1485,16 +1534,40 @@ int pim_rcv_v1(struct sk_buff * skb)
        skb->protocol = htons(ETH_P_IP);
        skb->ip_summed = 0;
        skb->pkt_type = PACKET_HOST;
        skb->protocol = htons(ETH_P_IP);
        skb->ip_summed = 0;
        skb->pkt_type = PACKET_HOST;

-       dst_release(skb->dst);
-       skb->dst = NULL;
-       ((struct net_device_stats*)netdev_priv(reg_dev))->rx_bytes += skb->len;
-       ((struct net_device_stats*)netdev_priv(reg_dev))->rx_packets++;
+       skb_dst_drop(skb);
+       reg_dev->stats.rx_bytes += skb->len;
+       reg_dev->stats.rx_packets++;

        nf_reset(skb);
        netif_rx(skb);
        dev_put(reg_dev);
        nf_reset(skb);
        netif_rx(skb);
        dev_put(reg_dev);

+

        return 0;
        return 0;

- drop:
-       kfree_skb(skb);
+}
+#endif
+
+#ifdef CONFIG_IP_PIMSM_V1
+/*
+ * Handle IGMP messages of PIMv1
+ */
+
+int pim_rcv_v1(struct sk_buff * skb)
+{
+       struct igmphdr *pim;
+       struct net *net = dev_net(skb->dev);
+
+       if (!pskb_may_pull(skb, sizeof(*pim) + sizeof(struct iphdr)))
+               goto drop;
+
+       pim = igmp_hdr(skb);
+
+       if (!net->ipv4.mroute_do_pim ||
+           pim->group != PIM_V1_VERSION || pim->code != PIM_V1_REGISTER)
+               goto drop;
+
+       if (__pim_rcv(skb, sizeof(*pim))) {
+drop:
+               kfree_skb(skb);
+       }

        return 0;
 }
 #endif
        return 0;
 }
 #endif


@@ -1503,10 +1576,8 @@ int pim_rcv_v1(struct sk_buff * skb)
 static int pim_rcv(struct sk_buff * skb)
 {
        struct pimreghdr *pim;
 static int pim_rcv(struct sk_buff * skb)
 {
        struct pimreghdr *pim;

-       struct iphdr   *encap;
-       struct net_device  *reg_dev = NULL;

 
 

-       if (!pskb_may_pull(skb, sizeof(*pim) + sizeof(*encap)))
+       if (!pskb_may_pull(skb, sizeof(*pim) + sizeof(struct iphdr)))

                goto drop;
 
        pim = (struct pimreghdr *)skb_transport_header(skb);
                goto drop;
 
        pim = (struct pimreghdr *)skb_transport_header(skb);


@@ -1516,41 +1587,10 @@ static int pim_rcv(struct sk_buff * skb)
             csum_fold(skb_checksum(skb, 0, skb->len, 0))))
                goto drop;
 
             csum_fold(skb_checksum(skb, 0, skb->len, 0))))
                goto drop;
 

-       /* check if the inner packet is destined to mcast group */
-       encap = (struct iphdr *)(skb_transport_header(skb) +
-                                sizeof(struct pimreghdr));
-       if (!ipv4_is_multicast(encap->daddr) ||
-           encap->tot_len == 0 ||
-           ntohs(encap->tot_len) + sizeof(*pim) > skb->len)
-               goto drop;
-
-       read_lock(&mrt_lock);
-       if (reg_vif_num >= 0)
-               reg_dev = vif_table[reg_vif_num].dev;
-       if (reg_dev)
-               dev_hold(reg_dev);
-       read_unlock(&mrt_lock);
-
-       if (reg_dev == NULL)
-               goto drop;
-
-       skb->mac_header = skb->network_header;
-       skb_pull(skb, (u8*)encap - skb->data);
-       skb_reset_network_header(skb);
-       skb->dev = reg_dev;
-       skb->protocol = htons(ETH_P_IP);
-       skb->ip_summed = 0;
-       skb->pkt_type = PACKET_HOST;
-       dst_release(skb->dst);
-       ((struct net_device_stats*)netdev_priv(reg_dev))->rx_bytes += skb->len;
-       ((struct net_device_stats*)netdev_priv(reg_dev))->rx_packets++;
-       skb->dst = NULL;
-       nf_reset(skb);
-       netif_rx(skb);
-       dev_put(reg_dev);
-       return 0;
- drop:
-       kfree_skb(skb);
+       if (__pim_rcv(skb, sizeof(*pim))) {
+drop:
+               kfree_skb(skb);
+       }

        return 0;
 }
 #endif
        return 0;
 }
 #endif


@@ -1560,23 +1600,24 @@ ipmr_fill_mroute(struct sk_buff *skb, struct mfc_cache *c, struct rtmsg *rtm)
 {
        int ct;
        struct rtnexthop *nhp;
 {
        int ct;
        struct rtnexthop *nhp;

-       struct net_device *dev = vif_table[c->mfc_parent].dev;
+       struct net *net = mfc_net(c);
+       struct net_device *dev = net->ipv4.vif_table[c->mfc_parent].dev;

        u8 *b = skb_tail_pointer(skb);
        struct rtattr *mp_head;
 
        if (dev)
                RTA_PUT(skb, RTA_IIF, 4, &dev->ifindex);
 
        u8 *b = skb_tail_pointer(skb);
        struct rtattr *mp_head;
 
        if (dev)
                RTA_PUT(skb, RTA_IIF, 4, &dev->ifindex);
 

-       mp_head = (struct rtattr*)skb_put(skb, RTA_LENGTH(0));
+       mp_head = (struct rtattr *)skb_put(skb, RTA_LENGTH(0));

 
        for (ct = c->mfc_un.res.minvif; ct < c->mfc_un.res.maxvif; ct++) {
                if (c->mfc_un.res.ttls[ct] < 255) {
                        if (skb_tailroom(skb) < RTA_ALIGN(RTA_ALIGN(sizeof(*nhp)) + 4))
                                goto rtattr_failure;
 
        for (ct = c->mfc_un.res.minvif; ct < c->mfc_un.res.maxvif; ct++) {
                if (c->mfc_un.res.ttls[ct] < 255) {
                        if (skb_tailroom(skb) < RTA_ALIGN(RTA_ALIGN(sizeof(*nhp)) + 4))
                                goto rtattr_failure;

-                       nhp = (struct rtnexthop*)skb_put(skb, RTA_ALIGN(sizeof(*nhp)));
+                       nhp = (struct rtnexthop *)skb_put(skb, RTA_ALIGN(sizeof(*nhp)));

                        nhp->rtnh_flags = 0;
                        nhp->rtnh_hops = c->mfc_un.res.ttls[ct];
                        nhp->rtnh_flags = 0;
                        nhp->rtnh_hops = c->mfc_un.res.ttls[ct];

-                       nhp->rtnh_ifindex = vif_table[ct].dev->ifindex;
+                       nhp->rtnh_ifindex = net->ipv4.vif_table[ct].dev->ifindex;

                        nhp->rtnh_len = sizeof(*nhp);
                }
        }
                        nhp->rtnh_len = sizeof(*nhp);
                }
        }


@@ -1590,16 +1631,17 @@ rtattr_failure:
        return -EMSGSIZE;
 }
 
        return -EMSGSIZE;
 }
 

-int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait)
+int ipmr_get_route(struct net *net,
+                  struct sk_buff *skb, struct rtmsg *rtm, int nowait)

 {
        int err;
        struct mfc_cache *cache;
 {
        int err;
        struct mfc_cache *cache;

-       struct rtable *rt = skb->rtable;
+       struct rtable *rt = skb_rtable(skb);

 
        read_lock(&mrt_lock);
 
        read_lock(&mrt_lock);

-       cache = ipmr_cache_find(rt->rt_src, rt->rt_dst);
+       cache = ipmr_cache_find(net, rt->rt_src, rt->rt_dst);

 
 

-       if (cache==NULL) {
+       if (cache == NULL) {

                struct sk_buff *skb2;
                struct iphdr *iph;
                struct net_device *dev;
                struct sk_buff *skb2;
                struct iphdr *iph;
                struct net_device *dev;


@@ -1628,7 +1670,7 @@ int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait)
                iph->saddr = rt->rt_src;
                iph->daddr = rt->rt_dst;
                iph->version = 0;
                iph->saddr = rt->rt_src;
                iph->daddr = rt->rt_dst;
                iph->version = 0;

-               err = ipmr_cache_unresolved(vif, skb2);
+               err = ipmr_cache_unresolved(net, vif, skb2);

                read_unlock(&mrt_lock);
                return err;
        }
                read_unlock(&mrt_lock);
                return err;
        }


@@ -1645,17 +1687,19 @@ int ipmr_get_route(struct sk_buff *skb, struct rtmsg *rtm, int nowait)
  *     The /proc interfaces to multicast routing /proc/ip_mr_cache /proc/ip_mr_vif
  */
 struct ipmr_vif_iter {
  *     The /proc interfaces to multicast routing /proc/ip_mr_cache /proc/ip_mr_vif
  */
 struct ipmr_vif_iter {

+       struct seq_net_private p;

        int ct;
 };
 
        int ct;
 };
 

-static struct vif_device *ipmr_vif_seq_idx(struct ipmr_vif_iter *iter,
+static struct vif_device *ipmr_vif_seq_idx(struct net *net,
+                                          struct ipmr_vif_iter *iter,

                                           loff_t pos)
 {
                                           loff_t pos)
 {

-       for (iter->ct = 0; iter->ct < maxvif; ++iter->ct) {
-               if (!VIF_EXISTS(iter->ct))
+       for (iter->ct = 0; iter->ct < net->ipv4.maxvif; ++iter->ct) {
+               if (!VIF_EXISTS(net, iter->ct))

                        continue;
                if (pos-- == 0)
                        continue;
                if (pos-- == 0)

-                       return &vif_table[iter->ct];
+                       return &net->ipv4.vif_table[iter->ct];

        }
        return NULL;
 }
        }
        return NULL;
 }


@@ -1663,23 +1707,26 @@ static struct vif_device *ipmr_vif_seq_idx(struct ipmr_vif_iter *iter,
 static void *ipmr_vif_seq_start(struct seq_file *seq, loff_t *pos)
        __acquires(mrt_lock)
 {
 static void *ipmr_vif_seq_start(struct seq_file *seq, loff_t *pos)
        __acquires(mrt_lock)
 {

+       struct net *net = seq_file_net(seq);
+

        read_lock(&mrt_lock);
        read_lock(&mrt_lock);

-       return *pos ? ipmr_vif_seq_idx(seq->private, *pos - 1)
+       return *pos ? ipmr_vif_seq_idx(net, seq->private, *pos - 1)

                : SEQ_START_TOKEN;
 }
 
 static void *ipmr_vif_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
        struct ipmr_vif_iter *iter = seq->private;
                : SEQ_START_TOKEN;
 }
 
 static void *ipmr_vif_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
        struct ipmr_vif_iter *iter = seq->private;

+       struct net *net = seq_file_net(seq);

 
        ++*pos;
        if (v == SEQ_START_TOKEN)
 
        ++*pos;
        if (v == SEQ_START_TOKEN)

-               return ipmr_vif_seq_idx(iter, 0);
+               return ipmr_vif_seq_idx(net, iter, 0);

 
 

-       while (++iter->ct < maxvif) {
-               if (!VIF_EXISTS(iter->ct))
+       while (++iter->ct < net->ipv4.maxvif) {
+               if (!VIF_EXISTS(net, iter->ct))

                        continue;
                        continue;

-               return &vif_table[iter->ct];
+               return &net->ipv4.vif_table[iter->ct];

        }
        return NULL;
 }
        }
        return NULL;
 }


@@ -1692,6 +1739,8 @@ static void ipmr_vif_seq_stop(struct seq_file *seq, void *v)
 
 static int ipmr_vif_seq_show(struct seq_file *seq, void *v)
 {
 
 static int ipmr_vif_seq_show(struct seq_file *seq, void *v)
 {

+       struct net *net = seq_file_net(seq);
+

        if (v == SEQ_START_TOKEN) {
                seq_puts(seq,
                         "Interface      BytesIn  PktsIn  BytesOut PktsOut Flags Local    Remote\n");
        if (v == SEQ_START_TOKEN) {
                seq_puts(seq,
                         "Interface      BytesIn  PktsIn  BytesOut PktsOut Flags Local    Remote\n");


@@ -1701,7 +1750,7 @@ static int ipmr_vif_seq_show(struct seq_file *seq, void *v)
 
                seq_printf(seq,
                           "%2Zd %-10s %8ld %7ld  %8ld %7ld %05X %08X %08X\n",
 
                seq_printf(seq,
                           "%2Zd %-10s %8ld %7ld  %8ld %7ld %05X %08X %08X\n",

-                          vif - vif_table,
+                          vif - net->ipv4.vif_table,

                           name, vif->bytes_in, vif->pkt_in,
                           vif->bytes_out, vif->pkt_out,
                           vif->flags, vif->local, vif->remote);
                           name, vif->bytes_in, vif->pkt_in,
                           vif->bytes_out, vif->pkt_out,
                           vif->flags, vif->local, vif->remote);


@@ -1718,8 +1767,8 @@ static const struct seq_operations ipmr_vif_seq_ops = {
 
 static int ipmr_vif_open(struct inode *inode, struct file *file)
 {
 
 static int ipmr_vif_open(struct inode *inode, struct file *file)
 {

-       return seq_open_private(file, &ipmr_vif_seq_ops,
-                       sizeof(struct ipmr_vif_iter));
+       return seq_open_net(inode, file, &ipmr_vif_seq_ops,
+                           sizeof(struct ipmr_vif_iter));

 }
 
 static const struct file_operations ipmr_vif_fops = {
 }
 
 static const struct file_operations ipmr_vif_fops = {


@@ -1727,23 +1776,26 @@ static const struct file_operations ipmr_vif_fops = {
        .open    = ipmr_vif_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
        .open    = ipmr_vif_open,
        .read    = seq_read,
        .llseek  = seq_lseek,

-       .release = seq_release_private,
+       .release = seq_release_net,

 };
 
 struct ipmr_mfc_iter {
 };
 
 struct ipmr_mfc_iter {

+       struct seq_net_private p;

        struct mfc_cache **cache;
        int ct;
 };
 
 
        struct mfc_cache **cache;
        int ct;
 };
 
 

-static struct mfc_cache *ipmr_mfc_seq_idx(struct ipmr_mfc_iter *it, loff_t pos)
+static struct mfc_cache *ipmr_mfc_seq_idx(struct net *net,
+                                         struct ipmr_mfc_iter *it, loff_t pos)

 {
        struct mfc_cache *mfc;
 
 {
        struct mfc_cache *mfc;
 

-       it->cache = mfc_cache_array;
+       it->cache = net->ipv4.mfc_cache_array;

        read_lock(&mrt_lock);
        for (it->ct = 0; it->ct < MFC_LINES; it->ct++)
        read_lock(&mrt_lock);
        for (it->ct = 0; it->ct < MFC_LINES; it->ct++)

-               for (mfc = mfc_cache_array[it->ct]; mfc; mfc = mfc->next)
+               for (mfc = net->ipv4.mfc_cache_array[it->ct];
+                    mfc; mfc = mfc->next)

                        if (pos-- == 0)
                                return mfc;
        read_unlock(&mrt_lock);
                        if (pos-- == 0)
                                return mfc;
        read_unlock(&mrt_lock);


@@ -1751,7 +1803,8 @@ static struct mfc_cache *ipmr_mfc_seq_idx(struct ipmr_mfc_iter *it, loff_t pos)
        it->cache = &mfc_unres_queue;
        spin_lock_bh(&mfc_unres_lock);
        for (mfc = mfc_unres_queue; mfc; mfc = mfc->next)
        it->cache = &mfc_unres_queue;
        spin_lock_bh(&mfc_unres_lock);
        for (mfc = mfc_unres_queue; mfc; mfc = mfc->next)

-               if (pos-- == 0)
+               if (net_eq(mfc_net(mfc), net) &&
+                   pos-- == 0)

                        return mfc;
        spin_unlock_bh(&mfc_unres_lock);
 
                        return mfc;
        spin_unlock_bh(&mfc_unres_lock);
 


@@ -1763,9 +1816,11 @@ static struct mfc_cache *ipmr_mfc_seq_idx(struct ipmr_mfc_iter *it, loff_t pos)
 static void *ipmr_mfc_seq_start(struct seq_file *seq, loff_t *pos)
 {
        struct ipmr_mfc_iter *it = seq->private;
 static void *ipmr_mfc_seq_start(struct seq_file *seq, loff_t *pos)
 {
        struct ipmr_mfc_iter *it = seq->private;

+       struct net *net = seq_file_net(seq);
+

        it->cache = NULL;
        it->ct = 0;
        it->cache = NULL;
        it->ct = 0;

-       return *pos ? ipmr_mfc_seq_idx(seq->private, *pos - 1)
+       return *pos ? ipmr_mfc_seq_idx(net, seq->private, *pos - 1)

                : SEQ_START_TOKEN;
 }
 
                : SEQ_START_TOKEN;
 }
 


@@ -1773,11 +1828,12 @@ static void *ipmr_mfc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
        struct mfc_cache *mfc = v;
        struct ipmr_mfc_iter *it = seq->private;
 {
        struct mfc_cache *mfc = v;
        struct ipmr_mfc_iter *it = seq->private;

+       struct net *net = seq_file_net(seq);

 
        ++*pos;
 
        if (v == SEQ_START_TOKEN)
 
        ++*pos;
 
        if (v == SEQ_START_TOKEN)

-               return ipmr_mfc_seq_idx(seq->private, 0);
+               return ipmr_mfc_seq_idx(net, seq->private, 0);

 
        if (mfc->next)
                return mfc->next;
 
        if (mfc->next)
                return mfc->next;


@@ -1785,10 +1841,10 @@ static void *ipmr_mfc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
        if (it->cache == &mfc_unres_queue)
                goto end_of_list;
 
        if (it->cache == &mfc_unres_queue)
                goto end_of_list;
 

-       BUG_ON(it->cache != mfc_cache_array);
+       BUG_ON(it->cache != net->ipv4.mfc_cache_array);

 
        while (++it->ct < MFC_LINES) {
 
        while (++it->ct < MFC_LINES) {

-               mfc = mfc_cache_array[it->ct];
+               mfc = net->ipv4.mfc_cache_array[it->ct];

                if (mfc)
                        return mfc;
        }
                if (mfc)
                        return mfc;
        }


@@ -1800,6 +1856,8 @@ static void *ipmr_mfc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 
        spin_lock_bh(&mfc_unres_lock);
        mfc = mfc_unres_queue;
 
        spin_lock_bh(&mfc_unres_lock);
        mfc = mfc_unres_queue;

+       while (mfc && !net_eq(mfc_net(mfc), net))
+               mfc = mfc->next;

        if (mfc)
                return mfc;
 
        if (mfc)
                return mfc;
 


@@ -1813,16 +1871,18 @@ static void *ipmr_mfc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 static void ipmr_mfc_seq_stop(struct seq_file *seq, void *v)
 {
        struct ipmr_mfc_iter *it = seq->private;
 static void ipmr_mfc_seq_stop(struct seq_file *seq, void *v)
 {
        struct ipmr_mfc_iter *it = seq->private;

+       struct net *net = seq_file_net(seq);

 
        if (it->cache == &mfc_unres_queue)
                spin_unlock_bh(&mfc_unres_lock);
 
        if (it->cache == &mfc_unres_queue)
                spin_unlock_bh(&mfc_unres_lock);

-       else if (it->cache == mfc_cache_array)
+       else if (it->cache == net->ipv4.mfc_cache_array)

                read_unlock(&mrt_lock);
 }
 
 static int ipmr_mfc_seq_show(struct seq_file *seq, void *v)
 {
        int n;
                read_unlock(&mrt_lock);
 }
 
 static int ipmr_mfc_seq_show(struct seq_file *seq, void *v)
 {
        int n;

+       struct net *net = seq_file_net(seq);

 
        if (v == SEQ_START_TOKEN) {
                seq_puts(seq,
 
        if (v == SEQ_START_TOKEN) {
                seq_puts(seq,


@@ -1831,23 +1891,29 @@ static int ipmr_mfc_seq_show(struct seq_file *seq, void *v)
                const struct mfc_cache *mfc = v;
                const struct ipmr_mfc_iter *it = seq->private;
 
                const struct mfc_cache *mfc = v;
                const struct ipmr_mfc_iter *it = seq->private;
 

-               seq_printf(seq, "%08lX %08lX %-3d %8ld %8ld %8ld",
+               seq_printf(seq, "%08lX %08lX %-3hd",

                           (unsigned long) mfc->mfc_mcastgrp,
                           (unsigned long) mfc->mfc_origin,
                           (unsigned long) mfc->mfc_mcastgrp,
                           (unsigned long) mfc->mfc_origin,

-                          mfc->mfc_parent,
-                          mfc->mfc_un.res.pkt,
-                          mfc->mfc_un.res.bytes,
-                          mfc->mfc_un.res.wrong_if);
+                          mfc->mfc_parent);

 
                if (it->cache != &mfc_unres_queue) {
 
                if (it->cache != &mfc_unres_queue) {

+                       seq_printf(seq, " %8lu %8lu %8lu",
+                                  mfc->mfc_un.res.pkt,
+                                  mfc->mfc_un.res.bytes,
+                                  mfc->mfc_un.res.wrong_if);

                        for (n = mfc->mfc_un.res.minvif;
                             n < mfc->mfc_un.res.maxvif; n++ ) {
                        for (n = mfc->mfc_un.res.minvif;
                             n < mfc->mfc_un.res.maxvif; n++ ) {

-                               if (VIF_EXISTS(n)
-                                  && mfc->mfc_un.res.ttls[n] < 255)
-                               seq_printf(seq,
+                               if (VIF_EXISTS(net, n) &&
+                                   mfc->mfc_un.res.ttls[n] < 255)
+                                       seq_printf(seq,

                                           " %2d:%-3d",
                                           n, mfc->mfc_un.res.ttls[n]);
                        }
                                           " %2d:%-3d",
                                           n, mfc->mfc_un.res.ttls[n]);
                        }

+               } else {
+                       /* unresolved mfc_caches don't contain
+                        * pkt, bytes and wrong_if values
+                        */
+                       seq_printf(seq, " %8lu %8lu %8lu", 0ul, 0ul, 0ul);

                }
                seq_putc(seq, '\n');
        }
                }
                seq_putc(seq, '\n');
        }


@@ -1863,8 +1929,8 @@ static const struct seq_operations ipmr_mfc_seq_ops = {
 
 static int ipmr_mfc_open(struct inode *inode, struct file *file)
 {
 
 static int ipmr_mfc_open(struct inode *inode, struct file *file)
 {

-       return seq_open_private(file, &ipmr_mfc_seq_ops,
-                       sizeof(struct ipmr_mfc_iter));
+       return seq_open_net(inode, file, &ipmr_mfc_seq_ops,
+                           sizeof(struct ipmr_mfc_iter));

 }
 
 static const struct file_operations ipmr_mfc_fops = {
 }
 
 static const struct file_operations ipmr_mfc_fops = {


@@ -1872,13 +1938,14 @@ static const struct file_operations ipmr_mfc_fops = {
        .open    = ipmr_mfc_open,
        .read    = seq_read,
        .llseek  = seq_lseek,
        .open    = ipmr_mfc_open,
        .read    = seq_read,
        .llseek  = seq_lseek,

-       .release = seq_release_private,
+       .release = seq_release_net,

 };
 #endif
 
 #ifdef CONFIG_IP_PIMSM_V2
 };
 #endif
 
 #ifdef CONFIG_IP_PIMSM_V2

-static struct net_protocol pim_protocol = {
+static const struct net_protocol pim_protocol = {

        .handler        =       pim_rcv,
        .handler        =       pim_rcv,

+       .netns_ok       =       1,

 };
 #endif
 
 };
 #endif
 


@@ -1886,17 +1953,102 @@ static struct net_protocol pim_protocol = {
 /*
  *     Setup for IP multicast routing
  */
 /*
  *     Setup for IP multicast routing
  */

+static int __net_init ipmr_net_init(struct net *net)
+{
+       int err = 0;

 
 

-void __init ip_mr_init(void)
+       net->ipv4.vif_table = kcalloc(MAXVIFS, sizeof(struct vif_device),
+                                     GFP_KERNEL);
+       if (!net->ipv4.vif_table) {
+               err = -ENOMEM;
+               goto fail;
+       }
+
+       /* Forwarding cache */
+       net->ipv4.mfc_cache_array = kcalloc(MFC_LINES,
+                                           sizeof(struct mfc_cache *),
+                                           GFP_KERNEL);
+       if (!net->ipv4.mfc_cache_array) {
+               err = -ENOMEM;
+               goto fail_mfc_cache;
+       }
+
+#ifdef CONFIG_IP_PIMSM
+       net->ipv4.mroute_reg_vif_num = -1;
+#endif
+
+#ifdef CONFIG_PROC_FS
+       err = -ENOMEM;
+       if (!proc_net_fops_create(net, "ip_mr_vif", 0, &ipmr_vif_fops))
+               goto proc_vif_fail;
+       if (!proc_net_fops_create(net, "ip_mr_cache", 0, &ipmr_mfc_fops))
+               goto proc_cache_fail;
+#endif
+       return 0;
+
+#ifdef CONFIG_PROC_FS
+proc_cache_fail:
+       proc_net_remove(net, "ip_mr_vif");
+proc_vif_fail:
+       kfree(net->ipv4.mfc_cache_array);
+#endif
+fail_mfc_cache:
+       kfree(net->ipv4.vif_table);
+fail:
+       return err;
+}
+
+static void __net_exit ipmr_net_exit(struct net *net)

 {
 {

+#ifdef CONFIG_PROC_FS
+       proc_net_remove(net, "ip_mr_cache");
+       proc_net_remove(net, "ip_mr_vif");
+#endif
+       kfree(net->ipv4.mfc_cache_array);
+       kfree(net->ipv4.vif_table);
+}
+
+static struct pernet_operations ipmr_net_ops = {
+       .init = ipmr_net_init,
+       .exit = ipmr_net_exit,
+};
+
+int __init ip_mr_init(void)
+{
+       int err;
+

        mrt_cachep = kmem_cache_create("ip_mrt_cache",
                                       sizeof(struct mfc_cache),
                                       0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                       NULL);
        mrt_cachep = kmem_cache_create("ip_mrt_cache",
                                       sizeof(struct mfc_cache),
                                       0, SLAB_HWCACHE_ALIGN|SLAB_PANIC,
                                       NULL);

+       if (!mrt_cachep)
+               return -ENOMEM;
+
+       err = register_pernet_subsys(&ipmr_net_ops);
+       if (err)
+               goto reg_pernet_fail;
+

        setup_timer(&ipmr_expire_timer, ipmr_expire_process, 0);
        setup_timer(&ipmr_expire_timer, ipmr_expire_process, 0);

-       register_netdevice_notifier(&ip_mr_notifier);
-#ifdef CONFIG_PROC_FS
-       proc_net_fops_create(&init_net, "ip_mr_vif", 0, &ipmr_vif_fops);
-       proc_net_fops_create(&init_net, "ip_mr_cache", 0, &ipmr_mfc_fops);
+       err = register_netdevice_notifier(&ip_mr_notifier);
+       if (err)
+               goto reg_notif_fail;
+#ifdef CONFIG_IP_PIMSM_V2
+       if (inet_add_protocol(&pim_protocol, IPPROTO_PIM) < 0) {
+               printk(KERN_ERR "ip_mr_init: can't add PIM protocol\n");
+               err = -EAGAIN;
+               goto add_proto_fail;
+       }

 #endif
 #endif

+       return 0;
+
+#ifdef CONFIG_IP_PIMSM_V2
+add_proto_fail:
+       unregister_netdevice_notifier(&ip_mr_notifier);
+#endif
+reg_notif_fail:
+       del_timer(&ipmr_expire_timer);
+       unregister_pernet_subsys(&ipmr_net_ops);
+reg_pernet_fail:
+       kmem_cache_destroy(mrt_cachep);
+       return err;

 }
 }