Commit f8fd36b9 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'mac80211-next-for-net-next-2020-11-13' of... 

Merge tag 'mac80211-next-for-net-next-2020-11-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

Johannes Berg says:

====================
Some updates:
 * injection/radiotap updates for new test capabilities
 * remove WDS support - even years ago when we turned
   it off by default it was already basically unusable
 * support for HE (802.11ax) rates for beacons
 * support for some vendor-specific HE rates
 * many other small features/cleanups

* tag 'mac80211-next-for-net-next-2020-11-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next: (21 commits)
  nl80211: fix kernel-doc warning in the new SAE attribute
  cfg80211: remove WDS code
  mac80211: remove WDS-related code
  rt2x00: remove WDS code
  b43legacy: remove WDS code
  b43: remove WDS code
  carl9170: remove WDS code
  ath9k: remove WDS code
  wireless: remove CONFIG_WIRELESS_WDS
  mac80211: assure that certain drivers adhere to DONT_REORDER flag
  mac80211: don't overwrite QoS TID of injected frames
  mac80211: adhere to Tx control flag that prevents frame reordering
  mac80211: add radiotap flag to assure frames are not reordered
  mac80211: save HE oper info in BSS config for mesh
  cfg80211: add support to configure HE MCS for beacon rate
  nl80211: fix beacon tx rate mask validation
  nl80211/cfg80211: fix potential infinite loop
  cfg80211: Add support to calculate and report 4096-QAM HE rates
  cfg80211: Add support to configure SAE PWE value to drivers
  ieee80211: Add definition for WFA DPP
  ...
====================

Link: https://lore.kernel.org/r/20201113101148.25268-1-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e1d9d7b9 da1e9dd3

drivers/net/wireless/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -18,19 +18,6 @@ menuconfig WLAN 


if WLAN



config WIRELESS_WDS

	bool "mac80211-based legacy WDS support" if EXPERT

	help

	  This option enables the deprecated WDS support, the newer

	  mac80211-based 4-addr AP/client support supersedes it with

	  a much better feature set (HT, VHT, ...)



	  We plan to remove this option and code, so if you find

	  that you have to enable it, please let us know on the

	  linux-wireless@vger.kernel.org mailing list, so we can

	  help you migrate to 4-addr AP/client (or, if it's really

	  necessary, give up on our plan of removing it).



source "drivers/net/wireless/admtek/Kconfig"

source "drivers/net/wireless/ath/Kconfig"

source "drivers/net/wireless/atmel/Kconfig"

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE