diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 19:29:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 19:29:41 -0800 |
| commit | c63a1190368771b8207d86c4217ae4afdf1cbd5e (patch) | |
| tree | b92409d027dbb1fdef33242b964d0105fc4ef4ad /net | |
| parent | ededa4d396b15c282aa60d6aacddfc07f0142dbf (diff) | |
| parent | 8085106a58366fb2c6c14d89e3d4395d2702d4a1 (diff) | |
| download | op-kernel-dev-c63a1190368771b8207d86c4217ae4afdf1cbd5e.zip op-kernel-dev-c63a1190368771b8207d86c4217ae4afdf1cbd5e.tar.gz | |
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
...
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/ieee80211_rate.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ieee80211_rate.c b/net/mac80211/ieee80211_rate.c index 7254bd6..3260a4a 100644 --- a/net/mac80211/ieee80211_rate.c +++ b/net/mac80211/ieee80211_rate.c @@ -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; } } |
