diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-12-17 18:05:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-12-17 18:05:43 -0500 |
| commit | 8085106a58366fb2c6c14d89e3d4395d2702d4a1 (patch) | |
| tree | 9c349f8ad0d6536cfd16f046776d9c8a71c81c21 /net | |
| parent | 961994a0c2a24d9622eea7144b30ac773169659f (diff) | |
| parent | 53e490936a91940a153e231c3b8288e3ecfcc5aa (diff) | |
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
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 7254bd609839..3260a4a0ecc5 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) | |||
| 33 | if (!strcmp(alg->ops->name, ops->name)) { | 33 | if (!strcmp(alg->ops->name, ops->name)) { |
| 34 | /* don't register an algorithm twice */ | 34 | /* don't register an algorithm twice */ |
| 35 | WARN_ON(1); | 35 | WARN_ON(1); |
| 36 | mutex_unlock(&rate_ctrl_mutex); | ||
| 36 | return -EALREADY; | 37 | return -EALREADY; |
| 37 | } | 38 | } |
| 38 | } | 39 | } |