diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-06-27 13:35:56 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-06-27 13:35:56 -0400 |
commit | f9fa39e9ace5a8abbe9597c2970828ced67261da (patch) | |
tree | f6ee7662344c372626aeed7b4c9a8d8525fd0fbc /net/wireless/nl80211.c | |
parent | e940f5d6ba6a01f8dbb870854d5205d322452730 (diff) | |
parent | e055a6e20a9105551295da164c31179b82c6227e (diff) | |
download | linux-f9fa39e9ace5a8abbe9597c2970828ced67261da.tar.gz linux-f9fa39e9ace5a8abbe9597c2970828ced67261da.tar.bz2 linux-f9fa39e9ace5a8abbe9597c2970828ced67261da.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r-- | net/wireless/nl80211.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index ba4f1723c83a..6668daf69326 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1497,18 +1497,17 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev, } CMD(start_p2p_device, START_P2P_DEVICE); CMD(set_mcast_rate, SET_MCAST_RATE); +#ifdef CONFIG_NL80211_TESTMODE + CMD(testmode_cmd, TESTMODE); +#endif if (state->split) { CMD(crit_proto_start, CRIT_PROTOCOL_START); CMD(crit_proto_stop, CRIT_PROTOCOL_STOP); if (rdev->wiphy.flags & WIPHY_FLAG_HAS_CHANNEL_SWITCH) CMD(channel_switch, CHANNEL_SWITCH); + CMD(set_qos_map, SET_QOS_MAP); } - CMD(set_qos_map, SET_QOS_MAP); - -#ifdef CONFIG_NL80211_TESTMODE - CMD(testmode_cmd, TESTMODE); -#endif - + /* add into the if now */ #undef CMD if (rdev->ops->connect || rdev->ops->auth) { |