-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The only supported kernel in the main branch now is version 6.6. It's time to clean up these useless codes and patches. Signed-off-by: Shiji Yang <[email protected]>
- Loading branch information
1 parent
f03163a
commit a4c95f1
Showing
11 changed files
with
12 additions
and
158 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
#ifdef CPTCFG_ATH9K_DEBUGFS | ||
--- a/drivers/net/wireless/ath/ath9k/gpio.c | ||
+++ b/drivers/net/wireless/ath/ath9k/gpio.c | ||
@@ -16,13 +16,139 @@ | ||
@@ -16,13 +16,135 @@ | ||
|
||
#include "ath9k.h" | ||
#include <linux/ath9k_platform.h> | ||
|
@@ -127,11 +127,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
+ snprintf(gc->label, sizeof(gc->label), "ath9k-%s", | ||
+ wiphy_name(sc->hw->wiphy)); | ||
+#ifdef CONFIG_OF | ||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0) | ||
+ gc->gchip.parent = sc->dev; | ||
+#else | ||
+ gc->gchip.dev = sc->dev; | ||
+#endif | ||
+#endif | ||
+ gc->gchip.label = gc->label; | ||
+ gc->gchip.base = -1; /* determine base automatically */ | ||
|
@@ -187,7 +183,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
static void ath_fill_led_pin(struct ath_softc *sc) | ||
{ | ||
struct ath_hw *ah = sc->sc_ah; | ||
@@ -80,6 +206,12 @@ static int ath_add_led(struct ath_softc | ||
@@ -80,6 +202,12 @@ static int ath_add_led(struct ath_softc | ||
else | ||
ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low); | ||
|
||
|
@@ -200,7 +196,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
return 0; | ||
} | ||
|
||
@@ -136,17 +268,24 @@ void ath_deinit_leds(struct ath_softc *s | ||
@@ -136,17 +264,24 @@ void ath_deinit_leds(struct ath_softc *s | ||
|
||
while (!list_empty(&sc->leds)) { | ||
led = list_first_entry(&sc->leds, struct ath_led, list); | ||
|
@@ -225,7 +221,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
char led_name[32]; | ||
const char *trigger; | ||
int i; | ||
@@ -156,6 +295,15 @@ void ath_init_leds(struct ath_softc *sc) | ||
@@ -156,6 +291,15 @@ void ath_init_leds(struct ath_softc *sc) | ||
if (AR_SREV_9100(sc->sc_ah)) | ||
return; | ||
|
||
|
@@ -241,7 +237,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
ath_fill_led_pin(sc); | ||
|
||
if (pdata && pdata->leds && pdata->num_leds) | ||
@@ -180,6 +328,7 @@ void ath_init_leds(struct ath_softc *sc) | ||
@@ -180,6 +324,7 @@ void ath_init_leds(struct ath_softc *sc) | ||
ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, | ||
!sc->sc_ah->config.led_active_high); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
#ifdef CPTCFG_MAC80211_LEDS | ||
|
||
@@ -133,6 +135,67 @@ static void ath9k_unregister_gpio_chip(s | ||
@@ -129,6 +131,67 @@ static void ath9k_unregister_gpio_chip(s | ||
sc->gpiochip = NULL; | ||
} | ||
|
||
|
@@ -97,7 +97,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
#else /* CONFIG_GPIOLIB */ | ||
|
||
static inline void ath9k_register_gpio_chip(struct ath_softc *sc) | ||
@@ -143,6 +206,14 @@ static inline void ath9k_unregister_gpio | ||
@@ -139,6 +202,14 @@ static inline void ath9k_unregister_gpio | ||
{ | ||
} | ||
|
||
|
@@ -112,15 +112,15 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
#endif /* CONFIG_GPIOLIB */ | ||
|
||
/********************************/ | ||
@@ -266,6 +337,7 @@ void ath_deinit_leds(struct ath_softc *s | ||
@@ -262,6 +333,7 @@ void ath_deinit_leds(struct ath_softc *s | ||
{ | ||
struct ath_led *led; | ||
|
||
+ ath9k_deinit_buttons(sc); | ||
while (!list_empty(&sc->leds)) { | ||
led = list_first_entry(&sc->leds, struct ath_led, list); | ||
#ifdef CONFIG_GPIOLIB | ||
@@ -305,6 +377,7 @@ void ath_init_leds(struct ath_softc *sc) | ||
@@ -301,6 +373,7 @@ void ath_init_leds(struct ath_softc *sc) | ||
} | ||
|
||
ath_fill_led_pin(sc); | ||
|
14 changes: 0 additions & 14 deletions
14
package/kernel/mac80211/patches/build/110-backport_namepace_const.patch
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
package/kernel/mac80211/patches/build/120-headers_version_fix.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 0 additions & 26 deletions
26
package/kernel/mac80211/patches/build/130-iommu_backport.patch
This file was deleted.
Oops, something went wrong.
32 changes: 0 additions & 32 deletions
32
package/kernel/mac80211/patches/build/210-backport_genl_split_ops.patch
This file was deleted.
Oops, something went wrong.
26 changes: 0 additions & 26 deletions
26
package/kernel/mac80211/patches/build/220-list-don-t-backport-list_count_nodes.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,15 +28,11 @@ Signed-off-by: Johannes Berg <[email protected]> | |
|
||
--- a/net/mac80211/sta_info.c | ||
+++ b/net/mac80211/sta_info.c | ||
@@ -565,6 +565,11 @@ __sta_info_alloc(struct ieee80211_sub_if | ||
@@ -565,6 +565,7 @@ __sta_info_alloc(struct ieee80211_sub_if | ||
spin_lock_init(&sta->ps_lock); | ||
INIT_WORK(&sta->drv_deliver_wk, sta_deliver_ps_frames); | ||
wiphy_work_init(&sta->ampdu_mlme.work, ieee80211_ba_session_work); | ||
+#if LINUX_VERSION_IS_LESS(6,2,0) | ||
+ sta->ampdu_mlme.dialog_token_allocator = prandom_u32_max(U8_MAX); | ||
+#else | ||
+ sta->ampdu_mlme.dialog_token_allocator = get_random_u32_below(U8_MAX); | ||
+#endif | ||
#ifdef CPTCFG_MAC80211_MESH | ||
if (ieee80211_vif_is_mesh(&sdata->vif)) { | ||
sta->mesh = kzalloc(sizeof(*sta->mesh), gfp); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
spin_lock_init(&local->active_txq_lock[i]); | ||
--- a/net/mac80211/sta_info.c | ||
+++ b/net/mac80211/sta_info.c | ||
@@ -2357,13 +2357,28 @@ EXPORT_SYMBOL(ieee80211_sta_recalc_aggre | ||
@@ -2353,13 +2353,28 @@ EXPORT_SYMBOL(ieee80211_sta_recalc_aggre | ||
|
||
void ieee80211_sta_update_pending_airtime(struct ieee80211_local *local, | ||
struct sta_info *sta, u8 ac, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: David Bauer <[email protected]> | |
|
||
--- a/net/mac80211/sta_info.c | ||
+++ b/net/mac80211/sta_info.c | ||
@@ -2459,6 +2459,13 @@ static void sta_stats_decode_rate(struct | ||
@@ -2455,6 +2455,13 @@ static void sta_stats_decode_rate(struct | ||
|
||
sband = local->hw.wiphy->bands[band]; | ||
|
||
|
29 changes: 0 additions & 29 deletions
29
...0211/patches/subsys/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch
This file was deleted.
Oops, something went wrong.