Commit f4899218 authored by Johannes Berg's avatar Johannes Berg
Browse files

ath9k: 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.e1d48ee20b0a.I89f8af0d50a02ce16a922fa790d6c1908f31a496@changeid


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

drivers/net/wireless/ath/ath9k/ath9k.h

+0 −1
Original line number Diff line number Diff line
@@ -661,7 +661,6 @@ struct ath9k_vif_iter_data { 
	int naps;      /* number of AP vifs */

	int nmeshes;   /* number of mesh vifs */

	int nstations; /* number of station vifs */

	int nwds;      /* number of WDS vifs */

	int nadhocs;   /* number of adhoc vifs */

	int nocbs;     /* number of OCB vifs */

	int nbcnvifs;  /* number of beaconing vifs */

drivers/net/wireless/ath/ath9k/debug.c

+2 −2
Original line number Diff line number Diff line
@@ -735,10 +735,10 @@ static int read_file_misc(struct seq_file *file, void *data) 
		ath9k_calculate_iter_data(sc, ctx, &iter_data);



		seq_printf(file,

			   "VIFS: CTX %i(%i) AP: %i STA: %i MESH: %i WDS: %i",

			   "VIFS: CTX %i(%i) AP: %i STA: %i MESH: %i",

			   i++, (int)(ctx->assigned), iter_data.naps,

			   iter_data.nstations,

			   iter_data.nmeshes, iter_data.nwds);

			   iter_data.nmeshes);

		seq_printf(file, " ADHOC: %i OCB: %i TOTAL: %hi BEACON-VIF: %hi\n",

			   iter_data.nadhocs, iter_data.nocbs, sc->cur_chan->nvifs,

			   sc->nbcnvifs);

drivers/net/wireless/ath/ath9k/init.c

+0 −19
Original line number Diff line number Diff line
@@ -832,12 +832,6 @@ static const struct ieee80211_iface_limit if_limits[] = { 
				 BIT(NL80211_IFTYPE_P2P_GO) },

};



#ifdef CONFIG_WIRELESS_WDS

static const struct ieee80211_iface_limit wds_limits[] = {

	{ .max = 2048,	.types = BIT(NL80211_IFTYPE_WDS) },

};

#endif



#ifdef CONFIG_ATH9K_CHANNEL_CONTEXT



static const struct ieee80211_iface_limit if_limits_multi[] = {
@@ -874,15 +868,6 @@ static const struct ieee80211_iface_combination if_comb[] = { 
					BIT(NL80211_CHAN_WIDTH_40),

#endif

	},

#ifdef CONFIG_WIRELESS_WDS

	{

		.limits = wds_limits,

		.n_limits = ARRAY_SIZE(wds_limits),

		.max_interfaces = 2048,

		.num_different_channels = 1,

		.beacon_int_infra_match = true,

	},

#endif

};



#ifdef CONFIG_ATH9K_CHANNEL_CONTEXT
@@ -897,7 +882,6 @@ static void ath9k_set_mcc_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 
	ieee80211_hw_set(hw, QUEUE_CONTROL);

	hw->queues = ATH9K_NUM_TX_QUEUES;

	hw->offchannel_tx_hw_queue = hw->queues - 1;

	hw->wiphy->interface_modes &= ~ BIT(NL80211_IFTYPE_WDS);

	hw->wiphy->iface_combinations = if_comb_multi;

	hw->wiphy->n_iface_combinations = ARRAY_SIZE(if_comb_multi);

	hw->wiphy->max_scan_ssids = 255;
@@ -953,9 +937,6 @@ static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) 
			BIT(NL80211_IFTYPE_STATION) |

			BIT(NL80211_IFTYPE_ADHOC) |

			BIT(NL80211_IFTYPE_MESH_POINT) |

#ifdef CONFIG_WIRELESS_WDS

			BIT(NL80211_IFTYPE_WDS) |

#endif

			BIT(NL80211_IFTYPE_OCB);



		if (ath9k_is_chanctx_enabled())

drivers/net/wireless/ath/ath9k/main.c

+0 −5
Original line number Diff line number Diff line
@@ -973,9 +973,6 @@ static void ath9k_vif_iter(struct ath9k_vif_iter_data *iter_data, 
		if (vif->bss_conf.enable_beacon)

			ath9k_vif_iter_set_beacon(iter_data, vif);

		break;

	case NL80211_IFTYPE_WDS:

		iter_data->nwds++;

		break;

	default:

		break;

	}
@@ -1136,8 +1133,6 @@ void ath9k_calculate_summary_state(struct ath_softc *sc, 
			ah->opmode = NL80211_IFTYPE_MESH_POINT;

		else if (iter_data.nocbs)

			ah->opmode = NL80211_IFTYPE_OCB;

		else if (iter_data.nwds)

			ah->opmode = NL80211_IFTYPE_AP;

		else if (iter_data.nadhocs)

			ah->opmode = NL80211_IFTYPE_ADHOC;

		else