Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32ab0a38 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-next-for-davem-2016-10-28' of... 

Merge tag 'mac80211-next-for-davem-2016-10-28' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next



Johannes Berg says:

====================
Among various cleanups and improvements, we have the following:
 * client FILS authentication support in mac80211 (Jouni)
 * AP/VLAN multicast improvements (Michael Braun)
 * config/advertising support for differing beacon intervals on
   multiple virtual interfaces (Purushottam Kushwaha, myself)
 * deprecate the old WDS mode for cfg80211-based drivers, the
   mode is hardly usable since it doesn't support any "modern"
   features like WPA encryption (2003), HT (2009) or VHT (2014),
   I'm not even sure WEP (introduced in 1997) could be done.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 97699056 51487718

Documentation/networking/mac80211_hwsim/README

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ modprobe mac80211_hwsim 
hostapd hostapd.conf



# Run wpa_supplicant (station) for wlan1

wpa_supplicant -Dwext -iwlan1 -c wpa_supplicant.conf

wpa_supplicant -Dnl80211 -iwlan1 -c wpa_supplicant.conf





More test cases are available in hostap.git:

drivers/net/wireless/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -17,6 +17,19 @@ 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/ath10k/mac.c

+1 −0
Original line number Diff line number Diff line
@@ -7881,6 +7881,7 @@ int ath10k_mac_register(struct ath10k *ar) 
	ieee80211_hw_set(ar->hw, WANT_MONITOR_VIF);

	ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA);

	ieee80211_hw_set(ar->hw, QUEUE_CONTROL);

	ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG);



	if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags))

		ieee80211_hw_set(ar->hw, SW_CRYPTO_CONTROL);

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

+6 −0
Original line number Diff line number Diff line
@@ -734,9 +734,11 @@ 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
@@ -774,6 +776,7 @@ 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),
@@ -781,6 +784,7 @@ static const struct ieee80211_iface_combination if_comb[] = { 
		.num_different_channels = 1,

		.beacon_int_infra_match = true,

	},

#endif

};



#ifdef CONFIG_ATH9K_CHANNEL_CONTEXT
@@ -851,7 +855,9 @@ 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/broadcom/b43/main.c

+2 −0
Original line number Diff line number Diff line
@@ -5591,7 +5591,9 @@ 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;