Commit 70d9c599 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove WDS-related code 

Now that all the mac80211-based drivers have removed WDS code
and in particular the ability to advertise such devices, also
remove all the code related to WDS here.

Link: https://lore.kernel.org/r/20201109105103.38960c413d46.I3603c90a44562d847c39d15d5ff33d8c00df5834@changeid


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

net/mac80211/cfg.c

+0 −11
Original line number Diff line number Diff line
@@ -2708,16 +2708,6 @@ static int ieee80211_get_tx_power(struct wiphy *wiphy, 
	return 0;

}



static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,

				  const u8 *addr)

{

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);



	memcpy(&sdata->u.wds.remote_addr, addr, ETH_ALEN);



	return 0;

}



static void ieee80211_rfkill_poll(struct wiphy *wiphy)

{

	struct ieee80211_local *local = wiphy_priv(wiphy);
@@ -4138,7 +4128,6 @@ const struct cfg80211_ops mac80211_config_ops = { 
	.set_wiphy_params = ieee80211_set_wiphy_params,

	.set_tx_power = ieee80211_set_tx_power,

	.get_tx_power = ieee80211_get_tx_power,

	.set_wds_peer = ieee80211_set_wds_peer,

	.rfkill_poll = ieee80211_rfkill_poll,

	CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)

	CFG80211_TESTMODE_DUMP(ieee80211_testmode_dump)

net/mac80211/chan.c

+1 −2
Original line number Diff line number Diff line
@@ -275,11 +275,11 @@ ieee80211_get_chanctx_max_required_bw(struct ieee80211_local *local, 
		case NL80211_IFTYPE_NAN:

			continue;

		case NL80211_IFTYPE_ADHOC:

		case NL80211_IFTYPE_WDS:

		case NL80211_IFTYPE_MESH_POINT:

		case NL80211_IFTYPE_OCB:

			width = vif->bss_conf.chandef.width;

			break;

		case NL80211_IFTYPE_WDS:

		case NL80211_IFTYPE_UNSPECIFIED:

		case NUM_NL80211_IFTYPES:

		case NL80211_IFTYPE_MONITOR:
@@ -743,7 +743,6 @@ void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local, 
			continue;

		case NL80211_IFTYPE_AP:

		case NL80211_IFTYPE_ADHOC:

		case NL80211_IFTYPE_WDS:

		case NL80211_IFTYPE_MESH_POINT:

		case NL80211_IFTYPE_OCB:

			break;

net/mac80211/debugfs_netdev.c

+0 −11
Original line number Diff line number Diff line
@@ -574,9 +574,6 @@ static ssize_t ieee80211_if_parse_tsf( 
IEEE80211_IF_FILE_RW(tsf);





/* WDS attributes */

IEEE80211_IF_FILE(peer, u.wds.remote_addr, MAC);



#ifdef CONFIG_MAC80211_MESH

IEEE80211_IF_FILE(estab_plinks, u.mesh.estab_plinks, ATOMIC);
@@ -701,11 +698,6 @@ static void add_ibss_files(struct ieee80211_sub_if_data *sdata) 
	DEBUGFS_ADD_MODE(tsf, 0600);

}



static void add_wds_files(struct ieee80211_sub_if_data *sdata)

{

	DEBUGFS_ADD(peer);

}



#ifdef CONFIG_MAC80211_MESH



static void add_mesh_files(struct ieee80211_sub_if_data *sdata)
@@ -805,9 +797,6 @@ static void add_files(struct ieee80211_sub_if_data *sdata) 
	case NL80211_IFTYPE_AP_VLAN:

		add_vlan_files(sdata);

		break;

	case NL80211_IFTYPE_WDS:

		add_wds_files(sdata);

		break;

	default:

		break;

	}

net/mac80211/ieee80211_i.h

+0 −6
Original line number Diff line number Diff line
@@ -311,11 +311,6 @@ struct ieee80211_if_ap { 
	bool multicast_to_unicast;

};



struct ieee80211_if_wds {

	struct sta_info *sta;

	u8 remote_addr[ETH_ALEN];

};



struct ieee80211_if_vlan {

	struct list_head list; /* write-protected with RTNL and local->mtx */
@@ -985,7 +980,6 @@ struct ieee80211_sub_if_data { 


	union {

		struct ieee80211_if_ap ap;

		struct ieee80211_if_wds wds;

		struct ieee80211_if_vlan vlan;

		struct ieee80211_if_managed mgd;

		struct ieee80211_if_ibss ibss;

net/mac80211/iface.c

+6 −46
Original line number Diff line number Diff line
@@ -230,10 +230,6 @@ static inline int identical_mac_addr_allowed(int type1, int type2) 
		type2 == NL80211_IFTYPE_MONITOR ||

		type1 == NL80211_IFTYPE_P2P_DEVICE ||

		type2 == NL80211_IFTYPE_P2P_DEVICE ||

		(type1 == NL80211_IFTYPE_AP && type2 == NL80211_IFTYPE_WDS) ||

		(type1 == NL80211_IFTYPE_WDS &&

			(type2 == NL80211_IFTYPE_WDS ||

			 type2 == NL80211_IFTYPE_AP)) ||

		(type1 == NL80211_IFTYPE_AP && type2 == NL80211_IFTYPE_AP_VLAN) ||

		(type1 == NL80211_IFTYPE_AP_VLAN &&

			(type2 == NL80211_IFTYPE_AP ||
@@ -417,15 +413,12 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
	 * (because if we remove a STA after ops->remove_interface()

	 * the driver will have removed the vif info already!)

	 *

	 * In WDS mode a station must exist here and be flushed, for

	 * AP_VLANs stations may exist since there's nothing else that

	 * For AP_VLANs stations may exist since there's nothing else that

	 * would have removed them, but in other modes there shouldn't

	 * be any stations.

	 */

	flushed = sta_info_flush(sdata);

	WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&

		     ((sdata->vif.type != NL80211_IFTYPE_WDS && flushed > 0) ||

		      (sdata->vif.type == NL80211_IFTYPE_WDS && flushed != 1)));

	WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_AP_VLAN && flushed > 0);



	/* don't count this interface for allmulti while it is down */

	if (sdata->flags & IEEE80211_SDATA_ALLMULTI)
@@ -552,8 +545,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, 
		 * When we get here, the interface is marked down.

		 * Free the remaining keys, if there are any

		 * (which can happen in AP mode if userspace sets

		 * keys before the interface is operating, and maybe

		 * also in WDS mode)

		 * keys before the interface is operating)

		 *

		 * Force the key freeing to always synchronize_net()

		 * to wait for the RX path in case it is using this
@@ -1020,16 +1012,11 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) 
	struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);

	struct net_device *dev = wdev->netdev;

	struct ieee80211_local *local = sdata->local;

	struct sta_info *sta;

	u32 changed = 0;

	int res;

	u32 hw_reconf_flags = 0;



	switch (sdata->vif.type) {

	case NL80211_IFTYPE_WDS:

		if (!is_valid_ether_addr(sdata->u.wds.remote_addr))

			return -ENOLINK;

		break;

	case NL80211_IFTYPE_AP_VLAN: {

		struct ieee80211_sub_if_data *master;
@@ -1078,6 +1065,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) 
	case NUM_NL80211_IFTYPES:

	case NL80211_IFTYPE_P2P_CLIENT:

	case NL80211_IFTYPE_P2P_GO:

	case NL80211_IFTYPE_WDS:

		/* cannot happen */

		WARN_ON(1);

		break;
@@ -1196,7 +1184,6 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) 
		case NL80211_IFTYPE_OCB:

			netif_carrier_off(dev);

			break;

		case NL80211_IFTYPE_WDS:

		case NL80211_IFTYPE_P2P_DEVICE:

		case NL80211_IFTYPE_NAN:

			break;
@@ -1218,28 +1205,6 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up) 
	set_bit(SDATA_STATE_RUNNING, &sdata->state);



	switch (sdata->vif.type) {

	case NL80211_IFTYPE_WDS:

		/* Create STA entry for the WDS peer */

		sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,

				     GFP_KERNEL);

		if (!sta) {

			res = -ENOMEM;

			goto err_del_interface;

		}



		sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);

		sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);

		sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);



		res = sta_info_insert(sta);

		if (res) {

			/* STA has been freed */

			goto err_del_interface;

		}



		rate_control_rate_init(sta);

		netif_carrier_on(dev);

		break;

	case NL80211_IFTYPE_P2P_DEVICE:

		rcu_assign_pointer(local->p2p_sdata, sdata);

		break;
@@ -1576,9 +1541,6 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, 
		sdata->u.mntr.flags = MONITOR_FLAG_CONTROL |

				      MONITOR_FLAG_OTHER_BSS;

		break;

	case NL80211_IFTYPE_WDS:

		sdata->vif.bss_conf.bssid = NULL;

		break;

	case NL80211_IFTYPE_NAN:

		idr_init(&sdata->u.nan.function_inst_ids);

		spin_lock_init(&sdata->u.nan.func_lock);
@@ -1589,6 +1551,7 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, 
		sdata->vif.bss_conf.bssid = sdata->vif.addr;

		break;

	case NL80211_IFTYPE_UNSPECIFIED:

	case NL80211_IFTYPE_WDS:

	case NUM_NL80211_IFTYPES:

		WARN_ON(1);

		break;
@@ -1633,9 +1596,7 @@ static int ieee80211_runtime_change_iftype(struct ieee80211_sub_if_data *sdata, 
	case NL80211_IFTYPE_OCB:

		/*

		 * Could probably support everything

		 * but WDS here (WDS do_open can fail

		 * under memory pressure, which this

		 * code isn't prepared to handle).

		 * but here.

		 */

		break;

	case NL80211_IFTYPE_P2P_CLIENT:
@@ -1728,7 +1689,6 @@ static void ieee80211_assign_perm_addr(struct ieee80211_local *local, 
	case NL80211_IFTYPE_MONITOR:

		/* doesn't matter */

		break;

	case NL80211_IFTYPE_WDS:

	case NL80211_IFTYPE_AP_VLAN:

		/* match up with an AP interface */

		list_for_each_entry(sdata, &local->interfaces, list) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE