lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Browse Source 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h
This commit is contained in:
David S. Miller
2010-07-23 14:03:38 -07:00
parent 344e0f623c 7a17a33c0d
commit 2a88e7e559
52 changed files with 315 additions and 2897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/cfg.c
View File

@@ -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;
}