mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (23 commits)
iwlwifi: fix rf_kill state inconsistent during suspend and resume
b43: Fix rfkill radio LED
bcm43xx_debugfs sscanf fix
libertas: select WIRELESS_EXT
iwlwifi3945/4965: fix rate control algo reference leak
ieee80211_rate: missed unlock
wireless/ipw2200.c: add __dev{init,exit} annotations
zd1211rw: Fix alignment problems
libertas: add Dan Williams as maintainer
sis190 endianness
ucc_geth: really fix section mismatch
pcnet_cs: add new id
ixgb: make sure jumbos stay enabled after reset
Net: ibm_newemac, remove SPIN_LOCK_UNLOCKED
net: smc911x: shut up compiler warnings
ucc_geth: minor whitespace fix
drivers/net/s2io.c section fixes
drivers/net/sis190.c section fix
hamachi endianness fixes
e100: free IRQ to remove warningwhenrebooting
...
This commit is contained in:
commit
c63a119036
24 changed files with 168 additions and 91 deletions
|
|
@ -33,6 +33,7 @@ int ieee80211_rate_control_register(struct rate_control_ops *ops)
|
|||
if (!strcmp(alg->ops->name, ops->name)) {
|
||||
/* don't register an algorithm twice */
|
||||
WARN_ON(1);
|
||||
mutex_unlock(&rate_ctrl_mutex);
|
||||
return -EALREADY;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue