diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-23 17:03:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-23 17:03:38 -0400 |
| commit | 2a88e7e559f2358f4e1422d0b0c0278a74136581 (patch) | |
| tree | b4e9e56dbde79fe7185cba511a1ffd85f5d2018e /net/mac80211/cfg.c | |
| parent | 344e0f623cec5eba273db06fe57db080988d6b26 (diff) | |
| parent | 7a17a33c0da37f8d24222c967550d19dabf13617 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 5e56e91c92c4..a3f3325df9f2 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
| @@ -1154,10 +1154,6 @@ static int ieee80211_set_txq_params(struct wiphy *wiphy, | |||
| 1154 | return -EINVAL; | 1154 | return -EINVAL; |
| 1155 | } | 1155 | } |
| 1156 | 1156 | ||
| 1157 | /* enable WMM or activate new settings */ | ||
| 1158 | local->hw.conf.flags |= IEEE80211_CONF_QOS; | ||
| 1159 | drv_config(local, IEEE80211_CONF_CHANGE_QOS); | ||
| 1160 | |||
| 1161 | return 0; | 1157 | return 0; |
| 1162 | } | 1158 | } |
| 1163 | 1159 | ||