Skip to content

Commit

Permalink
mac80211: Update to version 5.15.8
Browse files Browse the repository at this point in the history 
The following patches were backported from upstream before and are not
needed any more:
  package/kernel/mac80211/patches/ath10k/081-ath10k-fix-module-load-regression-with-iram-recovery-feature.patch
  package/kernel/mac80211/patches/ath10k/980-ath10k-fix-max-antenna-gain-unit.patch
  package/kernel/mac80211/patches/build/010-headers-Add-devm_platform_get_and_ioremap_resource.patch
  package/kernel/mac80211/patches/subsys/300-mac80211-drop-check-for-DONT_REORDER-in-__ieee80211_.patch
  package/kernel/mac80211/patches/subsys/307-mac80211-do-not-access-the-IV-when-it-was-stripped.patch
  package/kernel/mac80211/patches/subsys/308-mac80211-fix-radiotap-header-generation.patch

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  • Loading branch information
@hauke
hauke committed Dec 14, 2021
1 parent 30b9367 commit 3531a96
Show file tree
Hide file tree
Showing 19 changed files with 29 additions and 390 deletions.
6 changes: 3 additions & 3 deletions package/kernel/mac80211/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk

PKG_NAME:=mac80211

PKG_VERSION:=5.15-rc6-1
PKG_VERSION:=5.15.8-1
PKG_RELEASE:=1
PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v5.15-rc6/
PKG_HASH:=9282612c4c02ef9fc9d74405303033f6b53914cd63d631eef0f43155fcd38932
PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v5.15.8/
PKG_HASH:=9f71b659c034f19d156532ec780fcb606cee3c4ccc42e2f8ef18dd3e9f1b6820

PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/backports-$(PKG_VERSION)
Expand Down
121 changes: 0 additions & 121 deletions ...211/patches/ath10k/081-ath10k-fix-module-load-regression-with-iram-recovery-feature.patch
View file

This file was deleted.

4 changes: 2 additions & 2 deletions package/kernel/mac80211/patches/ath10k/930-ath10k_add_tpt_led_trigger.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -9820,6 +9820,21 @@ static int ath10k_mac_init_rd(struct ath
@@ -9843,6 +9843,21 @@ static int ath10k_mac_init_rd(struct ath
return 0;
}

Expand All @@ -22,7 +22,7 @@
int ath10k_mac_register(struct ath10k *ar)
{
static const u32 cipher_suites[] = {
@@ -10172,6 +10187,12 @@ int ath10k_mac_register(struct ath10k *a
@@ -10195,6 +10210,12 @@ int ath10k_mac_register(struct ath10k *a

ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;

Expand Down
14 changes: 7 additions & 7 deletions ...patches/ath10k/974-ath10k_add-LED-and-GPIO-controlling-support-for-various-chipsets.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ v13:
static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = {
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -7468,6 +7468,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
@@ -7472,6 +7472,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
return skb;
}

Expand Down Expand Up @@ -517,7 +517,7 @@ v13:
static struct sk_buff *
ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,
enum wmi_sta_ps_mode psmode)
@@ -9156,6 +9199,9 @@ static const struct wmi_ops wmi_ops = {
@@ -9160,6 +9203,9 @@ static const struct wmi_ops wmi_ops = {
.fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
.gen_echo = ath10k_wmi_op_gen_echo,
Expand All @@ -527,7 +527,7 @@ v13:
/* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */
@@ -9226,6 +9272,8 @@ static const struct wmi_ops wmi_10_1_ops
@@ -9230,6 +9276,8 @@ static const struct wmi_ops wmi_10_1_ops
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
.gen_echo = ath10k_wmi_op_gen_echo,
Expand All @@ -536,7 +536,7 @@ v13:
/* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */
@@ -9298,6 +9346,8 @@ static const struct wmi_ops wmi_10_2_ops
@@ -9302,6 +9350,8 @@ static const struct wmi_ops wmi_10_2_ops
.gen_delba_send = ath10k_wmi_op_gen_delba_send,
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
Expand All @@ -545,7 +545,7 @@ v13:
/* .gen_pdev_enable_adaptive_cca not implemented */
};

@@ -9369,6 +9419,8 @@ static const struct wmi_ops wmi_10_2_4_o
@@ -9373,6 +9423,8 @@ static const struct wmi_ops wmi_10_2_4_o
ath10k_wmi_op_gen_pdev_enable_adaptive_cca,
.get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype,
.gen_bb_timing = ath10k_wmi_10_2_4_op_gen_bb_timing,
Expand All @@ -554,7 +554,7 @@ v13:
/* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */
@@ -9450,6 +9502,8 @@ static const struct wmi_ops wmi_10_4_ops
@@ -9454,6 +9506,8 @@ static const struct wmi_ops wmi_10_4_ops
.gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info,
.gen_echo = ath10k_wmi_op_gen_echo,
.gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config,
Expand All @@ -565,7 +565,7 @@ v13:
int ath10k_wmi_attach(struct ath10k *ar)
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -3027,6 +3027,41 @@ enum wmi_10_4_feature_mask {
@@ -3030,6 +3030,41 @@ enum wmi_10_4_feature_mask {

};

Expand Down
2 changes: 1 addition & 1 deletion package/kernel/mac80211/patches/ath10k/975-ath10k-use-tpt-trigger-by-default.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
if (ret)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -10189,7 +10189,7 @@ int ath10k_mac_register(struct ath10k *a
@@ -10212,7 +10212,7 @@ int ath10k_mac_register(struct ath10k *a
ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER;

#ifdef CPTCFG_MAC80211_LEDS
Expand Down
49 changes: 0 additions & 49 deletions package/kernel/mac80211/patches/ath10k/980-ath10k-fix-max-antenna-gain-unit.patch
View file

This file was deleted.

8 changes: 4 additions & 4 deletions ...el/mac80211/patches/ath10k/981-ath10k-adjust-tx-power-reduction-for-US-regulatory-d.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Forwarded: no

--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -1017,6 +1017,40 @@ static inline int ath10k_vdev_setup_sync
@@ -1021,6 +1021,40 @@ static inline int ath10k_vdev_setup_sync
return ar->last_wmi_vdev_start_status;
}

Expand Down Expand Up @@ -69,7 +69,7 @@ Forwarded: no
static int ath10k_monitor_vdev_start(struct ath10k *ar, int vdev_id)
{
struct cfg80211_chan_def *chandef = NULL;
@@ -1049,7 +1083,8 @@ static int ath10k_monitor_vdev_start(str
@@ -1053,7 +1087,8 @@ static int ath10k_monitor_vdev_start(str
arg.channel.min_power = 0;
arg.channel.max_power = channel->max_power * 2;
arg.channel.max_reg_power = channel->max_reg_power * 2;
Expand All @@ -79,7 +79,7 @@ Forwarded: no

reinit_completion(&ar->vdev_setup_done);
reinit_completion(&ar->vdev_delete_done);
@@ -1495,7 +1530,8 @@ static int ath10k_vdev_start_restart(str
@@ -1499,7 +1534,8 @@ static int ath10k_vdev_start_restart(str
arg.channel.min_power = 0;
arg.channel.max_power = chandef->chan->max_power * 2;
arg.channel.max_reg_power = chandef->chan->max_reg_power * 2;
Expand All @@ -89,7 +89,7 @@ Forwarded: no

if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {
arg.ssid = arvif->u.ap.ssid;
@@ -3423,7 +3459,8 @@ static int ath10k_update_channel_list(st
@@ -3427,7 +3463,8 @@ static int ath10k_update_channel_list(st
ch->min_power = 0;
ch->max_power = channel->max_power * 2;
ch->max_reg_power = channel->max_reg_power * 2;
Expand Down
4 changes: 2 additions & 2 deletions package/kernel/mac80211/patches/ath9k/542-ath9k_debugfs_diag.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@
REG_SET_BIT(ah, AR_BTCOEX_WL_LNADIV, AR_BTCOEX_WL_LNADIV_FORCE_ON);
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -536,6 +536,11 @@ irqreturn_t ath_isr(int irq, void *dev)
if (test_bit(ATH_OP_HW_RESET, &common->op_flags))
@@ -538,6 +538,11 @@ irqreturn_t ath_isr(int irq, void *dev)
return IRQ_HANDLED;
}

+ if (test_bit(ATH_DIAG_TRIGGER_ERROR, &ah->diag)) {
+ status |= ATH9K_INT_FATAL;
Expand Down
4 changes: 2 additions & 2 deletions package/kernel/mac80211/patches/ath9k/551-ath9k_ubnt_uap_plus_hsr.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,15 +339,15 @@

static void ath9k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
u32 queues, bool drop);
@@ -657,6 +658,7 @@ void ath_reset_work(struct work_struct *
@@ -659,6 +660,7 @@ void ath_reset_work(struct work_struct *
static int ath9k_start(struct ieee80211_hw *hw)
{
struct ath_softc *sc = hw->priv;
+ struct device_node *np = sc->dev->of_node;
struct ath_hw *ah = sc->sc_ah;
struct ath_common *common = ath9k_hw_common(ah);
struct ieee80211_channel *curchan = sc->cur_chan->chandef.chan;
@@ -735,6 +737,11 @@ static int ath9k_start(struct ieee80211_
@@ -737,6 +739,11 @@ static int ath9k_start(struct ieee80211_
AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
}

Expand Down

0 comments on commit 3531a96

Please sign in to comment.