openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipv4: remove useless codes in ipmr_device_event() 

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>
This commit is contained in:
RongQing.Li 2011-11-23 23:10:52 +00:00 committed by David S. Miller
parent 115d2a3de2
commit e92036a651
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/ipv4/ipmr.c
View File

@ -1520,7 +1520,6 @@ static int ipmr_device_event(struct notifier_block *this, unsigned long event, v
struct mr_table *mrt; struct mr_table *mrt;
struct vif_device *v; struct vif_device *v;
int ct; int ct;
LIST_HEAD(list);
if (event != NETDEV_UNREGISTER) if (event != NETDEV_UNREGISTER)
return NOTIFY_DONE; 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]; v = &mrt->vif_table[0];
for (ct = 0; ct < mrt->maxvif; ct++, v++) { for (ct = 0; ct < mrt->maxvif; ct++, v++) {
if (v->dev == dev) if (v->dev == dev)
vif_delete(mrt, ct, 1, &list); vif_delete(mrt, ct, 1, NULL);
} }
} }
unregister_netdevice_many(&list);
return NOTIFY_DONE; return NOTIFY_DONE;
} }