Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02df00eb authored by Johannes Berg's avatar Johannes Berg
Browse files

nl80211: move set_qos_map command into split state 



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: fa9ffc74 ("cfg80211: Add support for QoS mapping")
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 0ce12026

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) {