Commit 81c9b7d4 authored by Johannes Berg's avatar Johannes Berg
Browse files

b43: 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.f1d9486874fc.I081f5771478ec3a45c2a22c158ed9aea661336e1@changeid


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

drivers/net/wireless/broadcom/b43/main.c

+1 −5
Original line number Diff line number Diff line
@@ -4961,12 +4961,11 @@ static int b43_op_add_interface(struct ieee80211_hw *hw, 
	struct b43_wldev *dev;

	int err = -EOPNOTSUPP;



	/* TODO: allow WDS/AP devices to coexist */

	/* TODO: allow AP devices to coexist */



	if (vif->type != NL80211_IFTYPE_AP &&

	    vif->type != NL80211_IFTYPE_MESH_POINT &&

	    vif->type != NL80211_IFTYPE_STATION &&

	    vif->type != NL80211_IFTYPE_WDS &&

	    vif->type != NL80211_IFTYPE_ADHOC)

		return -EOPNOTSUPP;
@@ -5576,9 +5575,6 @@ static struct b43_wl *b43_wireless_init(struct b43_bus_dev *dev) 
		BIT(NL80211_IFTYPE_AP) |

		BIT(NL80211_IFTYPE_MESH_POINT) |

		BIT(NL80211_IFTYPE_STATION) |

#ifdef CONFIG_WIRELESS_WDS

		BIT(NL80211_IFTYPE_WDS) |

#endif

		BIT(NL80211_IFTYPE_ADHOC);



	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;