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

Commit 5a7ec667 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-net-2019-10-31' of... 

Merge tag 'mac80211-for-net-2019-10-31' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211



Johannes Berg says:

====================
Just two fixes:
 * HT operation is not allowed on channel 14 (Japan only)
 * netlink policy for nexthop attribute was wrong
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3da09663 1fab1b89

net/wireless/chan.c

+5 −0
Original line number Diff line number Diff line
@@ -204,6 +204,11 @@ bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef) 
		return false;

	}



	/* channel 14 is only for IEEE 802.11b */

	if (chandef->center_freq1 == 2484 &&

	    chandef->width != NL80211_CHAN_WIDTH_20_NOHT)

		return false;



	if (cfg80211_chandef_is_edmg(chandef) &&

	    !cfg80211_edmg_chandef_valid(chandef))

		return false;

net/wireless/nl80211.c

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = { 
	[NL80211_ATTR_MNTR_FLAGS] = { /* NLA_NESTED can't be empty */ },

	[NL80211_ATTR_MESH_ID] = { .type = NLA_BINARY,

				   .len = IEEE80211_MAX_MESH_ID_LEN },

	[NL80211_ATTR_MPATH_NEXT_HOP] = { .type = NLA_U32 },

	[NL80211_ATTR_MPATH_NEXT_HOP] = NLA_POLICY_ETH_ADDR_COMPAT,



	[NL80211_ATTR_REG_ALPHA2] = { .type = NLA_STRING, .len = 2 },

	[NL80211_ATTR_REG_RULES] = { .type = NLA_NESTED },

net/wireless/util.c

+2 −1
Original line number Diff line number Diff line
@@ -1559,7 +1559,8 @@ bool ieee80211_chandef_to_operating_class(struct cfg80211_chan_def *chandef, 
	}



	if (freq == 2484) {

		if (chandef->width > NL80211_CHAN_WIDTH_40)

		/* channel 14 is only for IEEE 802.11b */

		if (chandef->width != NL80211_CHAN_WIDTH_20_NOHT)

			return false;



		*op_class = 82; /* channel 14 */