nl80211: move set_qos_map command into split state (02df00eb) · Commits · 戴 / test

The non-split wiphy state shouldn't be increased in size so move the new set_qos_map command into the split if statement. Cc: stable@vger.kernel.org (3.14+) Fixes: ("cfg80211: Add support for QoS mapping") Reviewed-by:

Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

net/wireless/nl80211.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -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);

		#ifdef CONFIG_NL80211_TESTMODE
		CMD(testmode_cmd, TESTMODE);
		#endif

		}
		/* add into the if now */
		#undef CMD

		if (rdev->ops->connect \|\| rdev->ops->auth) {

Admin message