mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig
This commit is contained in:
commit
3505d1a9fd
1961 changed files with 85021 additions and 28664 deletions
|
|
@ -282,8 +282,11 @@ out_uninit_applicant:
|
|||
if (ngrp)
|
||||
vlan_gvrp_uninit_applicant(real_dev);
|
||||
out_free_group:
|
||||
if (ngrp)
|
||||
vlan_group_free(ngrp);
|
||||
if (ngrp) {
|
||||
hlist_del_rcu(&ngrp->hlist);
|
||||
/* Free the group, after all cpu's are done. */
|
||||
call_rcu(&ngrp->rcu, vlan_rcu_free);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue