Commit 801a46bd authored by Johannes Berg's avatar Johannes Berg
Browse files

rt2x00: remove WDS code 

The ability to reach this code was hidden behind
CONFIG_WIRELESS_WDS, which was just removed. Clean
up the driver accordingly.

Link: https://lore.kernel.org/r/20201109105103.c3248409e449.I74954b87e5bdd23c99a5314d2b265889292a6cb5@changeid


Acked-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 8c21fc45

drivers/net/wireless/ralink/rt2x00/rt2x00config.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ void rt2x00lib_config_intf(struct rt2x00_dev *rt2x00dev, 
		break;

	case NL80211_IFTYPE_AP:

	case NL80211_IFTYPE_MESH_POINT:

	case NL80211_IFTYPE_WDS:

		conf.sync = TSF_SYNC_AP_NONE;

		break;

	case NL80211_IFTYPE_STATION:

drivers/net/wireless/ralink/rt2x00/rt2x00dev.c

+1 −5
Original line number Diff line number Diff line
@@ -194,8 +194,7 @@ static void rt2x00lib_beaconupdate_iter(void *data, u8 *mac, 


	if (vif->type != NL80211_IFTYPE_AP &&

	    vif->type != NL80211_IFTYPE_ADHOC &&

	    vif->type != NL80211_IFTYPE_MESH_POINT &&

	    vif->type != NL80211_IFTYPE_WDS)

	    vif->type != NL80211_IFTYPE_MESH_POINT)

		return;



	/*
@@ -1436,9 +1435,6 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev) 
		    BIT(NL80211_IFTYPE_ADHOC) |

#ifdef CONFIG_MAC80211_MESH

		    BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

#ifdef CONFIG_WIRELESS_WDS

		    BIT(NL80211_IFTYPE_WDS) |

#endif

		    BIT(NL80211_IFTYPE_AP);

drivers/net/wireless/ralink/rt2x00/rt2x00mac.c

+1 −2
Original line number Diff line number Diff line
@@ -408,8 +408,7 @@ static void rt2x00mac_set_tim_iter(void *data, u8 *mac, 


	if (vif->type != NL80211_IFTYPE_AP &&

	    vif->type != NL80211_IFTYPE_ADHOC &&

	    vif->type != NL80211_IFTYPE_MESH_POINT &&

	    vif->type != NL80211_IFTYPE_WDS)

	    vif->type != NL80211_IFTYPE_MESH_POINT)

		return;



	set_bit(DELAYED_UPDATE_BEACON, &intf->delayed_flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE