apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-3945.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c
This commit is contained in:
David S. Miller
2009-07-30 19:22:43 -07:00
parent a33bc5c151 0a924578bc
commit df597efb57
34 changed files with 185 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/bridge/br_if.c
+1 -1
View File
@@ -424,7 +424,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
err2:
br_fdb_delete_by_port(br, p, 1);
err1:
kobject_del(&p->kobj);
kobject_put(&p->kobj);
err0:
dev_set_promiscuity(dev, -1);
put_back: