UBUNTU: SAUCE: Revert "mac80211: handle deauthentication/disassociation from TDLS peer"

BugLink: https://bugs.launchpad.net/bugs/1848589

This reverts commit ac12d565 in favor of
its upstream stable version.
Signed-off-by: Connor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

net/mac80211/ieee80211_i.h

@@ -2059,9 +2059,6 @@ void ieee80211_tdls_cancel_channel_switch(struct wiphy *wiphy,
 					  const u8 *addr);
 void ieee80211_teardown_tdls_peers(struct ieee80211_sub_if_data *sdata);
 void ieee80211_tdls_chsw_work(struct work_struct *wk);
-void ieee80211_tdls_handle_disconnect(struct ieee80211_sub_if_data *sdata,
-				      const u8 *peer, u16 reason);
-const char *ieee80211_get_reason_code_string(u16 reason_code);
 
 extern const struct ethtool_ops ieee80211_ethtool_ops;
 

net/mac80211/mlme.c

@@ -2743,7 +2743,7 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
 #define case_WLAN(type) \
 	case WLAN_REASON_##type: return #type
 
-const char *ieee80211_get_reason_code_string(u16 reason_code)
+static const char *ieee80211_get_reason_code_string(u16 reason_code)
 {
 	switch (reason_code) {
 	case_WLAN(UNSPECIFIED);
@@ -2808,11 +2808,6 @@ static void ieee80211_rx_mgmt_deauth(struct ieee80211_sub_if_data *sdata,
 	if (len < 24 + 2)
 		return;
 
-	if (!ether_addr_equal(mgmt->bssid, mgmt->sa)) {
-		ieee80211_tdls_handle_disconnect(sdata, mgmt->sa, reason_code);
-		return;
-	}
-
 	if (ifmgd->associated &&
 	    ether_addr_equal(mgmt->bssid, ifmgd->associated->bssid)) {
 		const u8 *bssid = ifmgd->associated->bssid;
@@ -2862,11 +2857,6 @@ static void ieee80211_rx_mgmt_disassoc(struct ieee80211_sub_if_data *sdata,
 
 	reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
 
-	if (!ether_addr_equal(mgmt->bssid, mgmt->sa)) {
-		ieee80211_tdls_handle_disconnect(sdata, mgmt->sa, reason_code);
-		return;
-	}
-
 	sdata_info(sdata, "disassociated from %pM (Reason: %u)\n",
 		   mgmt->sa, reason_code);
 

net/mac80211/tdls.c

@@ -1963,26 +1963,3 @@ void ieee80211_tdls_chsw_work(struct work_struct *wk)
 	}
 	rtnl_unlock();
 }
-
-void ieee80211_tdls_handle_disconnect(struct ieee80211_sub_if_data *sdata,
-				      const u8 *peer, u16 reason)
-{
-	struct ieee80211_sta *sta;
-
-	rcu_read_lock();
-	sta = ieee80211_find_sta(&sdata->vif, peer);
-	if (!sta || !sta->tdls) {
-		rcu_read_unlock();
-		return;
-	}
-	rcu_read_unlock();
-
-	tdls_dbg(sdata, "disconnected from TDLS peer %pM (Reason: %u=%s)\n",
-		 peer, reason,
-		 ieee80211_get_reason_code_string(reason));
-
-	ieee80211_tdls_oper_request(&sdata->vif, peer,
-				    NL80211_TDLS_TEARDOWN,
-				    WLAN_REASON_TDLS_TEARDOWN_UNREACHABLE,
-				    GFP_ATOMIC);
-}