From 698cdf02020aa9855ab1000d6a359f816c76280e Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Mon, 11 Apr 2022 22:14:47 +0200 Subject: [PATCH] mac80211: Update to version 4.19.237-1 This updates mac80211 to version 4.19.237-1 which is based on kernel 4.19.237. This new release contains many fixes which were merged into the upstream Linux kernel. Signed-off-by: Hauke Mehrtens --- package/kernel/mac80211/Makefile | 6 +++--- .../kernel/mac80211/patches/subsys/210-ap_scan.patch | 2 +- .../350-mac80211-add-hdrlen-to-ieee80211_tx_data.patch | 4 ++-- ...1-IBSS-send-deauth-when-expiring-inactive-STA.patch | 10 +++++----- .../subsys/522-mac80211_configure_antenna_gain.patch | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index e41edb6ee9..b76a7cbaa1 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 -PKG_VERSION:=4.19.221-1 +PKG_VERSION:=4.19.237-1 PKG_RELEASE:=1 -PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v4.19.221/ -PKG_HASH:=343f54b21ddda4bc79c0457a7fa88356d430b802f86194abc20fe09c12559b05 +PKG_SOURCE_URL:=@KERNEL/linux/kernel/projects/backports/stable/v4.19.237/ +PKG_HASH:=e40ce1f4b707d5b1b5da3f4470f1ccf4f565602323424c89d956069df701bffd PKG_SOURCE:=backports-$(PKG_VERSION).tar.xz PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/backports-$(PKG_VERSION) diff --git a/package/kernel/mac80211/patches/subsys/210-ap_scan.patch b/package/kernel/mac80211/patches/subsys/210-ap_scan.patch index 57fd427f8f..6c8da3651e 100644 --- a/package/kernel/mac80211/patches/subsys/210-ap_scan.patch +++ b/package/kernel/mac80211/patches/subsys/210-ap_scan.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2192,7 +2192,7 @@ static int ieee80211_scan(struct wiphy * +@@ -2189,7 +2189,7 @@ static int ieee80211_scan(struct wiphy * * the frames sent while scanning on other channel will be * lost) */ diff --git a/package/kernel/mac80211/patches/subsys/350-mac80211-add-hdrlen-to-ieee80211_tx_data.patch b/package/kernel/mac80211/patches/subsys/350-mac80211-add-hdrlen-to-ieee80211_tx_data.patch index 0be1189598..2c7a985e2a 100644 --- a/package/kernel/mac80211/patches/subsys/350-mac80211-add-hdrlen-to-ieee80211_tx_data.patch +++ b/package/kernel/mac80211/patches/subsys/350-mac80211-add-hdrlen-to-ieee80211_tx_data.patch @@ -75,7 +75,7 @@ Signed-off-by: Felix Fietkau rcu_read_unlock(); --- a/net/mac80211/util.c +++ b/net/mac80211/util.c -@@ -1396,6 +1396,7 @@ void ieee80211_send_auth(struct ieee8021 +@@ -1398,6 +1398,7 @@ void ieee80211_send_auth(struct ieee8021 struct ieee80211_local *local = sdata->local; struct sk_buff *skb; struct ieee80211_mgmt *mgmt; @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau int err; /* 24 + 6 = header + auth_algo + auth_transaction + status_code */ -@@ -1419,8 +1420,10 @@ void ieee80211_send_auth(struct ieee8021 +@@ -1421,8 +1422,10 @@ void ieee80211_send_auth(struct ieee8021 skb_put_data(skb, extra, extra_len); if (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) { diff --git a/package/kernel/mac80211/patches/subsys/365-mac80211-IBSS-send-deauth-when-expiring-inactive-STA.patch b/package/kernel/mac80211/patches/subsys/365-mac80211-IBSS-send-deauth-when-expiring-inactive-STA.patch index d30642ee6c..c9b4e8a6cb 100644 --- a/package/kernel/mac80211/patches/subsys/365-mac80211-IBSS-send-deauth-when-expiring-inactive-STA.patch +++ b/package/kernel/mac80211/patches/subsys/365-mac80211-IBSS-send-deauth-when-expiring-inactive-STA.patch @@ -78,7 +78,7 @@ Signed-off-by: Johannes Berg } /* flush out frame - make sure the deauth was actually sent */ -@@ -4374,7 +4375,7 @@ void ieee80211_mgd_quiesce(struct ieee80 +@@ -4381,7 +4382,7 @@ void ieee80211_mgd_quiesce(struct ieee80 * cfg80211 won't know and won't actually abort those attempts, * thus we need to do that ourselves. */ @@ -87,7 +87,7 @@ Signed-off-by: Johannes Berg IEEE80211_STYPE_DEAUTH, WLAN_REASON_DEAUTH_LEAVING, false, frame_buf); -@@ -5354,7 +5355,7 @@ int ieee80211_mgd_deauth(struct ieee8021 +@@ -5361,7 +5362,7 @@ int ieee80211_mgd_deauth(struct ieee8021 ieee80211_get_reason_code_string(req->reason_code)); drv_mgd_prepare_tx(sdata->local, sdata, 0); @@ -96,7 +96,7 @@ Signed-off-by: Johannes Berg IEEE80211_STYPE_DEAUTH, req->reason_code, tx, frame_buf); -@@ -5374,7 +5375,7 @@ int ieee80211_mgd_deauth(struct ieee8021 +@@ -5381,7 +5382,7 @@ int ieee80211_mgd_deauth(struct ieee8021 ieee80211_get_reason_code_string(req->reason_code)); drv_mgd_prepare_tx(sdata->local, sdata, 0); @@ -107,7 +107,7 @@ Signed-off-by: Johannes Berg frame_buf); --- a/net/mac80211/util.c +++ b/net/mac80211/util.c -@@ -1433,7 +1433,8 @@ void ieee80211_send_auth(struct ieee8021 +@@ -1435,7 +1435,8 @@ void ieee80211_send_auth(struct ieee8021 } void ieee80211_send_deauth_disassoc(struct ieee80211_sub_if_data *sdata, @@ -117,7 +117,7 @@ Signed-off-by: Johannes Berg bool send_frame, u8 *frame_buf) { struct ieee80211_local *local = sdata->local; -@@ -1444,7 +1445,7 @@ void ieee80211_send_deauth_disassoc(stru +@@ -1446,7 +1447,7 @@ void ieee80211_send_deauth_disassoc(stru mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | stype); mgmt->duration = 0; /* initialize only */ mgmt->seq_ctrl = 0; /* initialize only */ diff --git a/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch index 3211dae542..72d05a3b0e 100644 --- a/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch +++ b/package/kernel/mac80211/patches/subsys/522-mac80211_configure_antenna_gain.patch @@ -57,7 +57,7 @@ __NL80211_ATTR_AFTER_LAST, --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2460,6 +2460,19 @@ static int ieee80211_get_tx_power(struct +@@ -2457,6 +2457,19 @@ static int ieee80211_get_tx_power(struct return 0; } @@ -77,7 +77,7 @@ static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev, const u8 *addr) { -@@ -3849,6 +3862,7 @@ const struct cfg80211_ops mac80211_confi +@@ -3846,6 +3859,7 @@ const struct cfg80211_ops mac80211_confi .set_wiphy_params = ieee80211_set_wiphy_params, .set_tx_power = ieee80211_set_tx_power, .get_tx_power = ieee80211_get_tx_power,