diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2019-08-03 12:30:38 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2019-08-17 13:41:16 +0200 |
| commit | 928e893a11db11b350f47921e269cfba17789df0 (patch) | |
| tree | 453148cfd6dbeea3232d27c8f1579fd58ca2b3da /package/kernel/mac80211/patches/build | |
| parent | 742505ef0984d77d966db97fa80407b071334208 (diff) | |
| download | upstream-928e893a11db11b350f47921e269cfba17789df0.tar.gz upstream-928e893a11db11b350f47921e269cfba17789df0.tar.bz2 upstream-928e893a11db11b350f47921e269cfba17789df0.zip | |
mac80211: Update to version 5.3-rc4-1
The removed patches were applied upstream.
The type of the RT2X00_LIB_EEPROM config option was changed to bool,
because boolean is an invalid value and the new kconfig system
complained about this.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/build')
3 files changed, 8 insertions, 7 deletions
diff --git a/package/kernel/mac80211/patches/build/002-change_allconfig.patch b/package/kernel/mac80211/patches/build/002-change_allconfig.patch index a071ae6370..368725d0c3 100644 --- a/package/kernel/mac80211/patches/build/002-change_allconfig.patch +++ b/package/kernel/mac80211/patches/build/002-change_allconfig.patch @@ -1,6 +1,6 @@ --- a/kconf/conf.c +++ b/kconf/conf.c -@@ -594,40 +594,12 @@ int main(int ac, char **av) +@@ -598,40 +598,12 @@ int main(int ac, char **av) case oldconfig: case listnewconfig: case olddefconfig: diff --git a/package/kernel/mac80211/patches/build/050-lib80211_option.patch b/package/kernel/mac80211/patches/build/050-lib80211_option.patch index f6e1f9be07..721e59661d 100644 --- a/package/kernel/mac80211/patches/build/050-lib80211_option.patch +++ b/package/kernel/mac80211/patches/build/050-lib80211_option.patch @@ -9,13 +9,14 @@ depends on m default n help -@@ -196,15 +196,15 @@ config LIB80211 +@@ -196,16 +196,16 @@ config LIB80211 Drivers should select this themselves if needed. config LIB80211_CRYPT_WEP - tristate + tristate "lib80211 WEP support" depends on m + select BPAUTO_CRYPTO_LIB_ARC4 config LIB80211_CRYPT_CCMP - tristate @@ -26,5 +27,5 @@ - tristate + tristate "lib80211 TKIP support" depends on m + select BPAUTO_CRYPTO_LIB_ARC4 - config LIB80211_DEBUG diff --git a/package/kernel/mac80211/patches/build/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/build/060-no_local_ssb_bcma.patch index 5ef01cc61e..dce99bbbdb 100644 --- a/package/kernel/mac80211/patches/build/060-no_local_ssb_bcma.patch +++ b/package/kernel/mac80211/patches/build/060-no_local_ssb_bcma.patch @@ -1,6 +1,6 @@ --- a/local-symbols +++ b/local-symbols -@@ -410,43 +410,6 @@ USB_SIERRA_NET= +@@ -412,43 +412,6 @@ USB_SIERRA_NET= USB_VL600= USB_NET_CH9200= USB_NET_AQC111= @@ -90,7 +90,7 @@ config B43_PHY_G --- a/drivers/net/wireless/broadcom/b43/main.c +++ b/drivers/net/wireless/broadcom/b43/main.c -@@ -2856,7 +2856,7 @@ static struct ssb_device *b43_ssb_gpio_d +@@ -2851,7 +2851,7 @@ static struct ssb_device *b43_ssb_gpio_d { struct ssb_bus *bus = dev->dev->sdev->bus; @@ -99,7 +99,7 @@ return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev); #else return bus->chipco.dev; -@@ -4873,7 +4873,7 @@ static int b43_wireless_core_init(struct +@@ -4868,7 +4868,7 @@ static int b43_wireless_core_init(struct } if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW) hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */ @@ -192,7 +192,7 @@ select BRCMUTIL --- a/Kconfig.local +++ b/Kconfig.local -@@ -1234,117 +1234,6 @@ config BACKPORTED_USB_NET_CH9200 +@@ -1240,117 +1240,6 @@ config BACKPORTED_USB_NET_CH9200 config BACKPORTED_USB_NET_AQC111 tristate default USB_NET_AQC111 |