mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
commit
b1513c3531
84 changed files with 617 additions and 249 deletions
|
|
@ -123,6 +123,7 @@ static void br_dev_uninit(struct net_device *dev)
|
|||
{
|
||||
struct net_bridge *br = netdev_priv(dev);
|
||||
|
||||
br_multicast_dev_del(br);
|
||||
br_multicast_uninit_stats(br);
|
||||
br_vlan_flush(br);
|
||||
free_percpu(br->stats);
|
||||
|
|
|
|||
|
|
@ -312,7 +312,6 @@ void br_dev_delete(struct net_device *dev, struct list_head *head)
|
|||
|
||||
br_fdb_delete_by_port(br, NULL, 0, 1);
|
||||
|
||||
br_multicast_dev_del(br);
|
||||
cancel_delayed_work_sync(&br->gc_work);
|
||||
|
||||
br_sysfs_delbr(br->dev);
|
||||
|
|
|
|||
Loading…
Reference in a new issue