ipv4: remove useless codes in ipmr_device_event()
authorRongQing.Li <roy.qing.li@gmail.com>
Wed, 23 Nov 2011 23:10:52 +0000 (23:10 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Nov 2011 23:32:33 +0000 (18:32 -0500)
Commit 7dc00c82 added a 'notify' parameter for vif_delete() to
distinguish whether to unregister the device.

When notify=1 means we does not need to unregister the device,
so calling unregister_netdevice_many is useless.

Signed-off-by: RongQing.Li <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ipmr.c

index 76a7f07b38b6edb13b48118c583ad754b96e1b11..8e54490ee3f490d6c07c99e87481b3a1dd395744 100644 (file)
@@ -1520,7 +1520,6 @@ static int ipmr_device_event(struct notifier_block *this, unsigned long event, v
        struct mr_table *mrt;
        struct vif_device *v;
        int ct;
-       LIST_HEAD(list);
 
        if (event != NETDEV_UNREGISTER)
                return NOTIFY_DONE;
@@ -1529,10 +1528,9 @@ static int ipmr_device_event(struct notifier_block *this, unsigned long event, v
                v = &mrt->vif_table[0];
                for (ct = 0; ct < mrt->maxvif; ct++, v++) {
                        if (v->dev == dev)
-                               vif_delete(mrt, ct, 1, &list);
+                               vif_delete(mrt, ct, 1, NULL);
                }
        }
-       unregister_netdevice_many(&list);
        return NOTIFY_DONE;
 }