mac80211: update to LEDE 24a7ccb0562a867e363a10ebdc64e3aaa6f01cd2

freifunk-gluon · Jun 7, 2016 · d31c1c9 · d31c1c9
1 parent deac14e
commit d31c1c9
Show file tree

Hide file tree

Showing 24 changed files with 8,804 additions and 41 deletions.
diff --git a/patches/openwrt/0006-mac80211-update-to-LEDE-24a7ccb0562a867e363a10ebdc64e3aaa6f01cd2.patch b/patches/openwrt/0006-mac80211-update-to-LEDE-24a7ccb0562a867e363a10ebdc64e3aaa6f01cd2.patch
diff --git a/...a-Technologies-firmware-for-QCA988X.patch → ...a-Technologies-firmware-for-QCA988X.patch b/...a-Technologies-firmware-for-QCA988X.patch → ...a-Technologies-firmware-for-QCA988X.patch
@@ -57,16 +57,3 @@ index b03d644..7d4d449 100644
 +$(eval $(call BuildPackage,ath10k-firmware-qca988x-ct))
  $(eval $(call BuildPackage,ath10k-firmware-qca99x0))
  $(eval $(call BuildPackage,ath10k-firmware-qca6174))
-diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
-index 30da1cf..cd8d670 100644
---- a/package/kernel/mac80211/Makefile
-+++ b/package/kernel/mac80211/Makefile
-@@ -247,7 +247,7 @@ define KernelPackage/ath10k
-   $(call KernelPackage/mac80211/Default)
-   TITLE:=Atheros 802.11ac wireless cards support
-   URL:=https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
--  DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY +ath10k-firmware-qca988x
-+  DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY
-   FILES:= \
- 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_core.ko \
- 	$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_pci.ko
diff --git a/...1-ath10k-allow-simultaneous-AP-IBSS.patch → ...1-ath10k-allow-simultaneous-AP-IBSS.patch b/...1-ath10k-allow-simultaneous-AP-IBSS.patch → ...1-ath10k-allow-simultaneous-AP-IBSS.patch
@@ -4,15 +4,15 @@ Subject: mac80211: ath10k: allow simultaneous AP+IBSS
 
 diff --git a/package/kernel/mac80211/patches/950-ath10k_AP_IBSS.patch b/package/kernel/mac80211/patches/950-ath10k_AP_IBSS.patch
 new file mode 100644
-index 0000000..33b3110
+index 0000000..86cef58
 --- /dev/null
 +++ b/package/kernel/mac80211/patches/950-ath10k_AP_IBSS.patch
 @@ -0,0 +1,32 @@
 +--- a/drivers/net/wireless/ath/ath10k/mac.c
 ++++ b/drivers/net/wireless/ath/ath10k/mac.c
-+@@ -5264,6 +5264,10 @@ static const struct ieee80211_iface_limi
-+ 	.max	= 7,
-+ 	.types	= BIT(NL80211_IFTYPE_AP)
++@@ -7466,6 +7466,10 @@ static const struct ieee80211_iface_limi
++ 			| BIT(NL80211_IFTYPE_MESH_POINT)
++ #endif
 + 	},
 ++	{
 ++	.max    = 1,
@@ -21,9 +21,9 @@ index 0000000..33b3110
 + };
 + 
 + static const struct ieee80211_iface_limit ath10k_10x_if_limits[] = {
-+@@ -5271,6 +5275,10 @@ static const struct ieee80211_iface_limi
-+ 	.max	= 8,
-+ 	.types	= BIT(NL80211_IFTYPE_AP)
++@@ -7480,6 +7484,10 @@ static const struct ieee80211_iface_limi
++ 		.max	= 1,
++ 		.types	= BIT(NL80211_IFTYPE_STATION)
 + 	},
 ++	{
 ++	.max    = 1,
@@ -32,11 +32,11 @@ index 0000000..33b3110
 + };
 + 
 + static const struct ieee80211_iface_combination ath10k_if_comb[] = {
-+@@ -5575,6 +5583,7 @@ int ath10k_mac_register(struct ath10k *a
++@@ -7859,6 +7867,7 @@ int ath10k_mac_register(struct ath10k *a
 + 		ar->hw->wiphy->iface_combinations = ath10k_10x_if_comb;
 + 		ar->hw->wiphy->n_iface_combinations =
 + 			ARRAY_SIZE(ath10k_10x_if_comb);
 ++		ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
 + 		break;
-+ 	case ATH10K_FW_WMI_OP_VERSION_UNSET:
-+ 	case ATH10K_FW_WMI_OP_VERSION_MAX:
++ 	case ATH10K_FW_WMI_OP_VERSION_10_4:
++ 		ar->hw->wiphy->iface_combinations = ath10k_10_4_if_comb;
diff --git a/...te-NanoStation-Loco-txpower-offsets.patch → ...te-NanoStation-Loco-txpower-offsets.patch b/...te-NanoStation-Loco-txpower-offsets.patch → ...te-NanoStation-Loco-txpower-offsets.patch
diff --git a/...apd-prevent-channel-switch-for-5GHz.patch → ...apd-prevent-channel-switch-for-5GHz.patch b/...apd-prevent-channel-switch-for-5GHz.patch → ...apd-prevent-channel-switch-for-5GHz.patch
diff --git a/...uner-support-for-UniFi-Outdoor-Plus.patch → ...uner-support-for-UniFi-Outdoor-Plus.patch b/...uner-support-for-UniFi-Outdoor-Plus.patch → ...uner-support-for-UniFi-Outdoor-Plus.patch
@@ -6,10 +6,10 @@ Patch-by: Stefan Rompf <stefan@loplof.de>
 
 diff --git a/package/kernel/mac80211/patches/931-ubnt-uap-plus-hsr.patch b/package/kernel/mac80211/patches/931-ubnt-uap-plus-hsr.patch
 new file mode 100644
-index 0000000..4533335
+index 0000000..8e09fee
 --- /dev/null
 +++ b/package/kernel/mac80211/patches/931-ubnt-uap-plus-hsr.patch
-@@ -0,0 +1,346 @@
+@@ -0,0 +1,349 @@
 +--- a/drivers/net/wireless/ath/ath9k/channel.c
 ++++ b/drivers/net/wireless/ath/ath9k/channel.c
 +@@ -15,6 +15,8 @@
@@ -43,7 +43,7 @@ index 0000000..4533335
 + 	ath_update_survey_stats(sc);
 +--- /dev/null
 ++++ b/drivers/net/wireless/ath/ath9k/hsr.c
-+@@ -0,0 +1,220 @@
++@@ -0,0 +1,223 @@
 ++/*
 ++ *
 ++ * The MIT License (MIT)
@@ -95,10 +95,13 @@ index 0000000..4533335
 ++
 ++
 ++void hsr_init(struct ath_hw* ah) {
-++	ath9k_hw_cfg_gpio_input(ah, HSR_GPIO_DIN);
-++	ath9k_hw_cfg_output(ah, HSR_GPIO_CSN, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-++	ath9k_hw_cfg_output(ah, HSR_GPIO_CLK, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-++	ath9k_hw_cfg_output(ah, HSR_GPIO_DOUT, AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+++	ath9k_hw_gpio_request_in(ah, HSR_GPIO_DIN, NULL);
+++	ath9k_hw_gpio_request_out(ah, HSR_GPIO_CSN, NULL,
+++				  AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+++	ath9k_hw_gpio_request_out(ah, HSR_GPIO_CLK, NULL,
+++				  AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+++	ath9k_hw_gpio_request_out(ah, HSR_GPIO_DOUT, NULL,
+++				  AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
 ++
 ++	ath9k_hw_set_gpio(ah, HSR_GPIO_CSN, 1);
 ++	ath9k_hw_set_gpio(ah, HSR_GPIO_CLK, 0);
@@ -321,9 +324,9 @@ index 0000000..4533335
 + 	struct ath_hw *ah = sc->sc_ah;
 + 	struct ath_common *common = ath9k_hw_common(ah);
 + 	struct ieee80211_channel *curchan = sc->cur_chan->chandef.chan;
-+@@ -730,6 +733,11 @@ static int ath9k_start(struct ieee80211_
++@@ -727,6 +730,11 @@ static int ath9k_start(struct ieee80211_
++ 		ath9k_hw_set_gpio(ah, ah->led_pin,
 + 				  (ah->config.led_active_high) ? 1 : 0);
-+ 	}
 + 
 ++	if (pdata && pdata->ubnt_hsr) {
 ++		hsr_init(ah);
@@ -347,10 +350,10 @@ index 0000000..4533335
 + ath9k-$(CPTCFG_ATH9K_PCI) += pci.o
 +--- a/include/linux/ath9k_platform.h
 ++++ b/include/linux/ath9k_platform.h
-+@@ -44,6 +44,8 @@ struct ath9k_platform_data {
-+ 
-+ 	int num_leds;
-+ 	const struct gpio_led *leds;
++@@ -54,6 +54,8 @@ struct ath9k_platform_data {
++ 	unsigned num_btns;
++ 	const struct gpio_keys_button *btns;
++ 	unsigned btn_poll_interval;
 ++
 ++	bool ubnt_hsr;
 + };
@@ -370,7 +373,7 @@ index 7803513..d865ed2 100644
  +	ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_outdoor_plus_leds_gpio),
 diff --git a/target/linux/generic/patches-3.18/150-ath9k_ubnt_hsr_filter.patch b/target/linux/generic/patches-3.18/150-ath9k_ubnt_hsr_filter.patch
 new file mode 100644
-index 0000000..a0ebbc7
+index 0000000..b8844f1
 --- /dev/null
 +++ b/target/linux/generic/patches-3.18/150-ath9k_ubnt_hsr_filter.patch
 @@ -0,0 +1,16 @@
@@ -381,10 +384,10 @@ index 0000000..a0ebbc7
 +
 +--- a/include/linux/ath9k_platform.h
 ++++ b/include/linux/ath9k_platform.h
-+@@ -44,6 +44,8 @@ struct ath9k_platform_data {
-+ 
-+ 	int num_leds;
-+ 	const struct gpio_led *leds;
++@@ -54,6 +54,8 @@ struct ath9k_platform_data {
++ 	unsigned num_btns;
++ 	const struct gpio_keys_button *btns;
++ 	unsigned btn_poll_interval;
 ++
 ++	bool ubnt_hsr;
 + };

diff --git a/...s-with-prohibited-blackholed-source.patch → ...s-with-prohibited-blackholed-source.patch b/...s-with-prohibited-blackholed-source.patch → ...s-with-prohibited-blackholed-source.patch
diff --git a/...tallation-of-headers-for-host-build.patch → ...tallation-of-headers-for-host-build.patch b/...tallation-of-headers-for-host-build.patch → ...tallation-of-headers-for-host-build.patch
diff --git a/...alloc-instead-of-oom-kill-processes.patch → ...alloc-instead-of-oom-kill-processes.patch b/...alloc-instead-of-oom-kill-processes.patch → ...alloc-instead-of-oom-kill-processes.patch
diff --git a/...port_bootpart-for-Xen-virtual-disks.patch → ...port_bootpart-for-Xen-virtual-disks.patch b/...port_bootpart-for-Xen-virtual-disks.patch → ...port_bootpart-for-Xen-virtual-disks.patch
diff --git a/...ort-LibreSSL-as-provider-of-openssl.patch → ...ort-LibreSSL-as-provider-of-openssl.patch b/...ort-LibreSSL-as-provider-of-openssl.patch → ...ort-LibreSSL-as-provider-of-openssl.patch
diff --git a/...gure-compatiblity-with-POSIX-shells.patch → ...gure-compatiblity-with-POSIX-shells.patch b/...gure-compatiblity-with-POSIX-shells.patch → ...gure-compatiblity-with-POSIX-shells.patch
diff --git a/...as-only-added-in-the-latest-version.patch → ...as-only-added-in-the-latest-version.patch b/...as-only-added-in-the-latest-version.patch → ...as-only-added-in-the-latest-version.patch
diff --git a/...ompile-flock-before-everything-else.patch → ...ompile-flock-before-everything-else.patch b/...ompile-flock-before-everything-else.patch → ...ompile-flock-before-everything-else.patch
diff --git a/...fall-back-to-unlocked-shell-command.patch → ...fall-back-to-unlocked-shell-command.patch b/...fall-back-to-unlocked-shell-command.patch → ...fall-back-to-unlocked-shell-command.patch
diff --git a/...e-conditions-with-multiple-variants.patch → ...e-conditions-with-multiple-variants.patch b/...e-conditions-with-multiple-variants.patch → ...e-conditions-with-multiple-variants.patch
diff --git a/...x-packed-checkout-mirroring-support.patch → ...x-packed-checkout-mirroring-support.patch b/...x-packed-checkout-mirroring-support.patch → ...x-packed-checkout-mirroring-support.patch
diff --git a/...-netifd-update-to-latest-git-master.patch → ...-netifd-update-to-latest-git-master.patch b/...-netifd-update-to-latest-git-master.patch → ...-netifd-update-to-latest-git-master.patch
diff --git a/...ols-pkg-config-fix-build-with-GCC-6.patch → ...ols-pkg-config-fix-build-with-GCC-6.patch b/...ols-pkg-config-fix-build-with-GCC-6.patch → ...ols-pkg-config-fix-build-with-GCC-6.patch
diff --git a/...inux-compiler-.h-with-u-boot-master.patch → ...inux-compiler-.h-with-u-boot-master.patch b/...inux-compiler-.h-with-u-boot-master.patch → ...inux-compiler-.h-with-u-boot-master.patch
diff --git a/...-toolchain-gcc-fix-build-with-GCC-6.patch → ...-toolchain-gcc-fix-build-with-GCC-6.patch b/...-toolchain-gcc-fix-build-with-GCC-6.patch → ...-toolchain-gcc-fix-build-with-GCC-6.patch
diff --git a/...-backport-spi-nor-driver-from-4.4.9.patch → ...-backport-spi-nor-driver-from-4.4.9.patch b/...-backport-spi-nor-driver-from-4.4.9.patch → ...-backport-spi-nor-driver-from-4.4.9.patch
diff --git a/...il-status-register-writes-are-ready.patch → ...il-status-register-writes-are-ready.patch b/...il-status-register-writes-are-ready.patch → ...il-status-register-writes-are-ready.patch
diff --git a/...l-mtd-spi-nor-unlock-Winbond-flashs.patch → ...l-mtd-spi-nor-unlock-Winbond-flashs.patch b/...l-mtd-spi-nor-unlock-Winbond-flashs.patch → ...l-mtd-spi-nor-unlock-Winbond-flashs.patch