Revert "mac80211: support NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_MAC_ADDRS"

This reverts commit 9b125c27998719288e4dcf2faf54511039526692.

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: 9b125c279987 ("mac80211: support NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_MAC_ADDRS")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20200224101910.b87da63a3cd6.Ic94bc51a370c4aa7d19fbca9b96d90ab703257dc@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index cae3a34d3503fed7cff76224b40ea3bcf60d1f34..944e86da5c65a6f4c3e3af3192c34d79a957f064 100644 (file)
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -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_CONTROL_PORT_OVER_NL80211);
-       wiphy_ext_feature_set(wiphy,
-                             NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_MAC_ADDRS);
 
        if (!ops->hw_scan) {
                wiphy->features |= NL80211_FEATURE_LOW_PRIORITY_SCAN |

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 8dd93072f6e6a27608bea944e2f005f49ebd627f..2645a39cce882e481ec8839b3120d94cec12bf90 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -5315,7 +5315,7 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev,
 
        ehdr = skb_push(skb, sizeof(struct ethhdr));
        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;
 
        skb->dev = dev;