diff options
| author | David S. Miller | 2010-07-23 23:03:38 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-07-23 23:03:38 +0200 |
| commit | 2a88e7e559f2358f4e1422d0b0c0278a74136581 (patch) | |
| tree | b4e9e56dbde79fe7185cba511a1ffd85f5d2018e /net/mac80211/cfg.c | |
| parent | 3c59x: Fix call to mdio_sync() with the wrong argument (diff) | |
| parent | mac80211: proper IBSS locking (diff) | |
| download | kernel-qcow2-linux-2a88e7e559f2358f4e1422d0b0c0278a74136581.tar.gz kernel-qcow2-linux-2a88e7e559f2358f4e1422d0b0c0278a74136581.tar.xz kernel-qcow2-linux-2a88e7e559f2358f4e1422d0b0c0278a74136581.zip | |
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, return -EINVAL; } - /* enable WMM or activate new settings */ - local->hw.conf.flags |= IEEE80211_CONF_QOS; - drv_config(local, IEEE80211_CONF_CHANGE_QOS); - return 0; } |