mac80211: Update to version 5.7.5-1
The b43 and b43legacy driver now support DRIVER_11W_SUPPORT. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
		| @@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk | |||||||
|  |  | ||||||
| PKG_NAME:=mac80211 | PKG_NAME:=mac80211 | ||||||
|  |  | ||||||
| PKG_VERSION:=5.7-rc3-1 | PKG_VERSION:=5.7.5-1 | ||||||
| PKG_RELEASE:=2 | PKG_RELEASE:=1 | ||||||
| PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v5.7-rc3/ | PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v5.7.5/ | ||||||
| PKG_HASH:=7bc785c932f011c65adb75ffa746be2fa90b16ab61a6e1fd883acee403ffeed1 | PKG_HASH:=200312d46eb6a94676f611af6baebbffc5cbf3b7dd75e72a69c767704c37b571 | ||||||
|  |  | ||||||
| PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz | PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz | ||||||
| PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/backports-$(PKG_VERSION) | PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/backports-$(PKG_VERSION) | ||||||
|   | |||||||
| @@ -105,7 +105,7 @@ define KernelPackage/b43 | |||||||
|   	CONFIG_HW_RANDOM=y |   	CONFIG_HW_RANDOM=y | ||||||
|   # Depend on PCI_SUPPORT to make sure we can select kmod-bcma or kmod-ssb |   # Depend on PCI_SUPPORT to make sure we can select kmod-bcma or kmod-ssb | ||||||
|   DEPENDS += \ |   DEPENDS += \ | ||||||
| 	@PCI_SUPPORT +kmod-mac80211 +kmod-lib-cordic \ | 	@PCI_SUPPORT +@DRIVER_11W_SUPPORT +kmod-mac80211 +kmod-lib-cordic \ | ||||||
| 	$(if $(CONFIG_PACKAGE_B43_USE_SSB),+kmod-ssb) \ | 	$(if $(CONFIG_PACKAGE_B43_USE_SSB),+kmod-ssb) \ | ||||||
| 	$(if $(CONFIG_PACKAGE_B43_USE_BCMA),+kmod-bcma) | 	$(if $(CONFIG_PACKAGE_B43_USE_BCMA),+kmod-bcma) | ||||||
|   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/b43/b43.ko |   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/b43/b43.ko | ||||||
| @@ -347,7 +347,7 @@ define KernelPackage/b43legacy | |||||||
|   URL:=https://wireless.wiki.kernel.org/en/users/drivers/b43 |   URL:=https://wireless.wiki.kernel.org/en/users/drivers/b43 | ||||||
|   KCONFIG:= \ |   KCONFIG:= \ | ||||||
|   	CONFIG_HW_RANDOM=y |   	CONFIG_HW_RANDOM=y | ||||||
|   DEPENDS+= +kmod-mac80211 +!(TARGET_bcm47xx||TARGET_bcm63xx):kmod-ssb @!TARGET_bcm47xx_mips74k +b43legacy-firmware |   DEPENDS+= +kmod-mac80211 +!(TARGET_bcm47xx||TARGET_bcm63xx):kmod-ssb @!TARGET_bcm47xx_mips74k +b43legacy-firmware +@DRIVER_11W_SUPPORT | ||||||
|   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/b43legacy/b43legacy.ko |   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/broadcom/b43legacy/b43legacy.ko | ||||||
|   AUTOLOAD:=$(call AutoProbe,b43legacy) |   AUTOLOAD:=$(call AutoProbe,b43legacy) | ||||||
|   MENU:=1 |   MENU:=1 | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/drivers/net/wireless/ath/ath9k/init.c | --- a/drivers/net/wireless/ath/ath9k/init.c | ||||||
| +++ b/drivers/net/wireless/ath/ath9k/init.c | +++ b/drivers/net/wireless/ath/ath9k/init.c | ||||||
| @@ -1143,25 +1143,25 @@ static int __init ath9k_init(void) | @@ -1141,25 +1141,25 @@ static int __init ath9k_init(void) | ||||||
|  { |  { | ||||||
|  	int error; |  	int error; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -181,7 +181,7 @@ | |||||||
|   |   | ||||||
| --- a/drivers/net/wireless/ath/ath9k/init.c | --- a/drivers/net/wireless/ath/ath9k/init.c | ||||||
| +++ b/drivers/net/wireless/ath/ath9k/init.c | +++ b/drivers/net/wireless/ath/ath9k/init.c | ||||||
| @@ -1055,7 +1055,7 @@ int ath9k_init_device(u16 devid, struct | @@ -1053,7 +1053,7 @@ int ath9k_init_device(u16 devid, struct | ||||||
|   |   | ||||||
|  #ifdef CPTCFG_MAC80211_LEDS |  #ifdef CPTCFG_MAC80211_LEDS | ||||||
|  	/* must be initialized before ieee80211_register_hw */ |  	/* must be initialized before ieee80211_register_hw */ | ||||||
|   | |||||||
| @@ -65,7 +65,7 @@ | |||||||
|  } |  } | ||||||
|   |   | ||||||
|  static const struct ieee80211_iface_limit if_limits[] = { |  static const struct ieee80211_iface_limit if_limits[] = { | ||||||
| @@ -1015,6 +1016,18 @@ static void ath9k_set_hw_capab(struct at | @@ -1013,6 +1014,18 @@ static void ath9k_set_hw_capab(struct at | ||||||
|  	wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_AIRTIME_FAIRNESS); |  	wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_AIRTIME_FAIRNESS); | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -84,7 +84,7 @@ | |||||||
|  int ath9k_init_device(u16 devid, struct ath_softc *sc, |  int ath9k_init_device(u16 devid, struct ath_softc *sc, | ||||||
|  		    const struct ath_bus_ops *bus_ops) |  		    const struct ath_bus_ops *bus_ops) | ||||||
|  { |  { | ||||||
| @@ -1060,6 +1073,8 @@ int ath9k_init_device(u16 devid, struct | @@ -1058,6 +1071,8 @@ int ath9k_init_device(u16 devid, struct | ||||||
|  		ARRAY_SIZE(ath9k_tpt_blink)); |  		ARRAY_SIZE(ath9k_tpt_blink)); | ||||||
|  #endif |  #endif | ||||||
|   |   | ||||||
|   | |||||||
| @@ -26,7 +26,7 @@ Forwarded: https://patchwork.kernel.org/patch/11367055/ | |||||||
|  |  | ||||||
| --- a/drivers/net/wireless/ath/ath10k/htt.h | --- a/drivers/net/wireless/ath/ath10k/htt.h | ||||||
| +++ b/drivers/net/wireless/ath/ath10k/htt.h | +++ b/drivers/net/wireless/ath/ath10k/htt.h | ||||||
| @@ -2221,7 +2221,7 @@ struct htt_rx_chan_info { | @@ -2228,7 +2228,7 @@ struct htt_rx_chan_info { | ||||||
|   * Should be: sizeof(struct htt_host_rx_desc) + max rx MSDU size, |   * Should be: sizeof(struct htt_host_rx_desc) + max rx MSDU size, | ||||||
|   * rounded up to a cache line size. |   * rounded up to a cache line size. | ||||||
|   */ |   */ | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/drivers/net/wireless/ath/ath10k/mac.c | --- a/drivers/net/wireless/ath/ath10k/mac.c | ||||||
| +++ b/drivers/net/wireless/ath/ath10k/mac.c | +++ b/drivers/net/wireless/ath/ath10k/mac.c | ||||||
| @@ -8781,6 +8781,21 @@ static int ath10k_mac_init_rd(struct ath | @@ -8785,6 +8785,21 @@ static int ath10k_mac_init_rd(struct ath | ||||||
|  	return 0; |  	return 0; | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -22,7 +22,7 @@ | |||||||
|  int ath10k_mac_register(struct ath10k *ar) |  int ath10k_mac_register(struct ath10k *ar) | ||||||
|  { |  { | ||||||
|  	static const u32 cipher_suites[] = { |  	static const u32 cipher_suites[] = { | ||||||
| @@ -9109,6 +9124,12 @@ int ath10k_mac_register(struct ath10k *a | @@ -9112,6 +9127,12 @@ int ath10k_mac_register(struct ath10k *a | ||||||
|   |   | ||||||
|  	ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER; |  	ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ v2: fix trailing whitespace issue and fix some typos within the commit note | |||||||
|  2 files changed, 8 insertions(+), 10 deletions(-) |  2 files changed, 8 insertions(+), 10 deletions(-) | ||||||
| --- a/drivers/net/wireless/ath/ath10k/mac.c | --- a/drivers/net/wireless/ath/ath10k/mac.c | ||||||
| +++ b/drivers/net/wireless/ath/ath10k/mac.c | +++ b/drivers/net/wireless/ath/ath10k/mac.c | ||||||
| @@ -4585,13 +4585,6 @@ static struct ieee80211_sta_vht_cap ath1 | @@ -4588,13 +4588,6 @@ static struct ieee80211_sta_vht_cap ath1 | ||||||
|  		vht_cap.cap |= val; |  		vht_cap.cap |= val; | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
|   | |||||||
| @@ -407,7 +407,7 @@ v13: | |||||||
|  /* Rates */ |  /* Rates */ | ||||||
| --- a/drivers/net/wireless/ath/ath10k/wmi-ops.h | --- a/drivers/net/wireless/ath/ath10k/wmi-ops.h | ||||||
| +++ b/drivers/net/wireless/ath/ath10k/wmi-ops.h | +++ b/drivers/net/wireless/ath/ath10k/wmi-ops.h | ||||||
| @@ -216,7 +216,10 @@ struct wmi_ops { | @@ -217,7 +217,10 @@ struct wmi_ops { | ||||||
|  	struct sk_buff *(*gen_bb_timing) |  	struct sk_buff *(*gen_bb_timing) | ||||||
|  			(struct ath10k *ar, |  			(struct ath10k *ar, | ||||||
|  			 const struct wmi_bb_timing_cfg_arg *arg); |  			 const struct wmi_bb_timing_cfg_arg *arg); | ||||||
| @@ -418,7 +418,7 @@ v13: | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id); |  int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id); | ||||||
| @@ -1080,6 +1083,35 @@ ath10k_wmi_force_fw_hang(struct ath10k * | @@ -1090,6 +1093,35 @@ ath10k_wmi_force_fw_hang(struct ath10k * | ||||||
|  	return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->force_fw_hang_cmdid); |  	return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->force_fw_hang_cmdid); | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -456,7 +456,7 @@ v13: | |||||||
|  { |  { | ||||||
| --- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c | --- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c | ||||||
| +++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c | +++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c | ||||||
| @@ -4447,6 +4447,8 @@ static const struct wmi_ops wmi_tlv_ops | @@ -4462,6 +4462,8 @@ static const struct wmi_ops wmi_tlv_ops | ||||||
|  	.gen_echo = ath10k_wmi_tlv_op_gen_echo, |  	.gen_echo = ath10k_wmi_tlv_op_gen_echo, | ||||||
|  	.gen_vdev_spectral_conf = ath10k_wmi_tlv_op_gen_vdev_spectral_conf, |  	.gen_vdev_spectral_conf = ath10k_wmi_tlv_op_gen_vdev_spectral_conf, | ||||||
|  	.gen_vdev_spectral_enable = ath10k_wmi_tlv_op_gen_vdev_spectral_enable, |  	.gen_vdev_spectral_enable = ath10k_wmi_tlv_op_gen_vdev_spectral_enable, | ||||||
|   | |||||||
| @@ -42,7 +42,7 @@ Signed-off-by: Mathias Kresin <dev@kresin.me> | |||||||
|  	if (ret) |  	if (ret) | ||||||
| --- a/drivers/net/wireless/ath/ath10k/mac.c | --- a/drivers/net/wireless/ath/ath10k/mac.c | ||||||
| +++ b/drivers/net/wireless/ath/ath10k/mac.c | +++ b/drivers/net/wireless/ath/ath10k/mac.c | ||||||
| @@ -9141,7 +9141,7 @@ int ath10k_mac_register(struct ath10k *a | @@ -9144,7 +9144,7 @@ int ath10k_mac_register(struct ath10k *a | ||||||
|  	ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER; |  	ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER; | ||||||
|   |   | ||||||
|  #ifdef CPTCFG_MAC80211_LEDS |  #ifdef CPTCFG_MAC80211_LEDS | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> | |||||||
|  |  | ||||||
| --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | ||||||
| +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | ||||||
| @@ -2942,6 +2942,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip | @@ -2941,6 +2941,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip | ||||||
|  	 * preference in cfg struct to apply this to |  	 * preference in cfg struct to apply this to | ||||||
|  	 * FW later while initializing the dongle |  	 * FW later while initializing the dongle | ||||||
|  	 */ |  	 */ | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | ||||||
| +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | ||||||
| @@ -2894,6 +2894,63 @@ done: | @@ -2893,6 +2893,63 @@ done: | ||||||
|  } |  } | ||||||
|   |   | ||||||
|  static int |  static int | ||||||
| @@ -64,7 +64,7 @@ | |||||||
|  brcmf_cfg80211_dump_station(struct wiphy *wiphy, struct net_device *ndev, |  brcmf_cfg80211_dump_station(struct wiphy *wiphy, struct net_device *ndev, | ||||||
|  			    int idx, u8 *mac, struct station_info *sinfo) |  			    int idx, u8 *mac, struct station_info *sinfo) | ||||||
|  { |  { | ||||||
| @@ -2983,6 +3040,7 @@ static s32 brcmf_inform_single_bss(struc | @@ -2982,6 +3039,7 @@ static s32 brcmf_inform_single_bss(struc | ||||||
|  	struct brcmu_chan ch; |  	struct brcmu_chan ch; | ||||||
|  	u16 channel; |  	u16 channel; | ||||||
|  	u32 freq; |  	u32 freq; | ||||||
| @@ -72,7 +72,7 @@ | |||||||
|  	u16 notify_capability; |  	u16 notify_capability; | ||||||
|  	u16 notify_interval; |  	u16 notify_interval; | ||||||
|  	u8 *notify_ie; |  	u8 *notify_ie; | ||||||
| @@ -3007,6 +3065,17 @@ static s32 brcmf_inform_single_bss(struc | @@ -3006,6 +3064,17 @@ static s32 brcmf_inform_single_bss(struc | ||||||
|  		band = NL80211_BAND_5GHZ; |  		band = NL80211_BAND_5GHZ; | ||||||
|   |   | ||||||
|  	freq = ieee80211_channel_to_frequency(channel, band); |  	freq = ieee80211_channel_to_frequency(channel, band); | ||||||
| @@ -90,7 +90,7 @@ | |||||||
|  	bss_data.chan = ieee80211_get_channel(wiphy, freq); |  	bss_data.chan = ieee80211_get_channel(wiphy, freq); | ||||||
|  	bss_data.scan_width = NL80211_BSS_CHAN_WIDTH_20; |  	bss_data.scan_width = NL80211_BSS_CHAN_WIDTH_20; | ||||||
|  	bss_data.boottime_ns = ktime_to_ns(ktime_get_boottime()); |  	bss_data.boottime_ns = ktime_to_ns(ktime_get_boottime()); | ||||||
| @@ -5424,6 +5493,7 @@ static struct cfg80211_ops brcmf_cfg8021 | @@ -5423,6 +5492,7 @@ static struct cfg80211_ops brcmf_cfg8021 | ||||||
|  	.leave_ibss = brcmf_cfg80211_leave_ibss, |  	.leave_ibss = brcmf_cfg80211_leave_ibss, | ||||||
|  	.get_station = brcmf_cfg80211_get_station, |  	.get_station = brcmf_cfg80211_get_station, | ||||||
|  	.dump_station = brcmf_cfg80211_dump_station, |  	.dump_station = brcmf_cfg80211_dump_station, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Hauke Mehrtens
					Hauke Mehrtens