Commit 8079e4fe authored by Johannes Berg's avatar Johannes Berg
Browse files

Revert "mac80211: support NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_MAC_ADDRS" 



This reverts commit 9b125c27.

As Jouni points out, there's really no need for this, since the
RSN pre-authentication frames are normal data frames, not port
control frames (locally).

Fixes: 9b125c27 ("mac80211: support NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_MAC_ADDRS")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20200224101910.b87da63a3cd6.Ic94bc51a370c4aa7d19fbca9b96d90ab703257dc@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 7bb106eb

net/mac80211/main.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -589,8 +589,6 @@ struct ieee80211_hw *ieee80211_alloc_hw_nm(size_t priv_data_len, 
	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_STA);

	wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_STA);

	wiphy_ext_feature_set(wiphy,

	wiphy_ext_feature_set(wiphy,

			      NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211);

			      NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211);

	wiphy_ext_feature_set(wiphy,

			      NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_MAC_ADDRS);





	if (!ops->hw_scan) {

	if (!ops->hw_scan) {

		wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |

		wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |

net/mac80211/tx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -5315,7 +5315,7 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev, 




	ehdr = skb_push(skb, sizeof(struct ethhdr));

	ehdr = skb_push(skb, sizeof(struct ethhdr));

	memcpy(ehdr->h_dest, dest, ETH_ALEN);

	memcpy(ehdr->h_dest, dest, ETH_ALEN);

	memcpy(ehdr->h_source, src, ETH_ALEN);

	memcpy(ehdr->h_source, sdata->vif.addr, ETH_ALEN);

	ehdr->h_proto = proto;

	ehdr->h_proto = proto;





	skb->dev = dev;

	skb->dev = dev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE