fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: fixes build after kernel 4.9.297

Browse Source 
Fixes: #666
Also refresh all patches.
This commit is contained in:
AmadeusGhost 2022-04-06 23:21:08 +08:00
parent 3037af80c4
commit c0c201ee95
4 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/mac80211/patches/ath/553-ath9k_of_gpio_mask.patch
View File

@ -13,7 +13,7 @@
static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
const struct ath_bus_ops *bus_ops)
{
@@ -758,6 +764,9 @@ static int ath9k_init_softc(u16 devid, s
@@ -760,6 +766,9 @@ static int ath9k_init_softc(u16 devid, s
if (ret)
goto err_hw;

2
package/kernel/mac80211/patches/ath/983-ath10k-allow-vht-on-2g.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -4718,6 +4718,7 @@ static void ath10k_mac_setup_ht_vht_cap(
@@ -4636,6 +4636,7 @@ static void ath10k_mac_setup_ht_vht_cap(
if (ar->phy_capability & WHAL_WLAN_11G_CAPABILITY) {
band = &ar->mac.sbands[NL80211_BAND_2GHZ];
band->ht_cap = ht_cap;

18
package/kernel/mac80211/patches/build/005-fix_build_bug.patch Normal file
View File

@ -0,0 +1,18 @@
--- a/backport-include/linux/build_bug.h
+++ b/backport-include/linux/build_bug.h
@@ -1,10 +1,12 @@
#ifndef __BP_BUILD_BUG_H
#define __BP_BUILD_BUG_H
+#include <linux/version.h>
-#if LINUX_VERSION_IS_GEQ(4,13,0)
+#if LINUX_VERSION_IS_GEQ(4,13,0) || \
+ LINUX_VERSION_IN_RANGE(4,9,255, 4,10,0)
#include_next <linux/build_bug.h>
-#else /* LINUX_VERSION_IS_GEQ(4,13,0) */
+#else
#include <linux/bug.h>
-#endif /* LINUX_VERSION_IS_GEQ(4,13,0) */
+#endif /* >= 4.13 */
#endif /* __BP_BUILD_BUG_H */

6
package/kernel/mac80211/patches/subsys/600-mac80211-allow-vht-on-2g.patch
View File

@ -1,6 +1,6 @@
--- a/net/mac80211/vht.c
+++ b/net/mac80211/vht.c
@@ -135,7 +135,8 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(stru
@@ -137,7 +137,8 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(stru
have_80mhz = false;
for (i = 0; i < sband->n_channels; i++) {
if (sband->channels[i].flags & (IEEE80211_CHAN_DISABLED |
@ -12,7 +12,7 @@
have_80mhz = true;
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1769,7 +1769,8 @@ static int ieee80211_build_preq_ies_band
@@ -1618,7 +1618,8 @@ static int ieee80211_build_preq_ies_band
/* Check if any channel in this sband supports at least 80 MHz */
for (i = 0; i < sband->n_channels; i++) {
if (sband->channels[i].flags & (IEEE80211_CHAN_DISABLED |
@ -24,7 +24,7 @@
have_80mhz = true;
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -4824,7 +4824,8 @@ static int ieee80211_prep_channel(struct
@@ -4694,7 +4694,8 @@ static int ieee80211_prep_channel(struct
have_80mhz = false;
for (i = 0; i < sband->n_channels; i++) {
if (sband->channels[i].flags & (IEEE80211_CHAN_DISABLED |