diff mbox series

[04/30] patches: Refresh on kernel 5.8.18

Message ID 20201201220415.30582-5-hauke@hauke-m.de (mailing list archive)
State New, archived
Headers show
Series backports: Update to match kernel 5.10-rc6 | expand

Commit Message

Hauke Mehrtens Dec. 1, 2020, 10:03 p.m. UTC 
No manual changes needed.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/0002-disable-dump-adjust-on-old-kernels.patch | 4 ++--
 patches/0014-netlink_seq/net_wireless_nl80211.patch   | 2 +-
 patches/0071-skb-head_frag/wireless.patch             | 2 +-
 patches/0077-genl-ro-after-init/nl80211.patch         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/patches/0002-disable-dump-adjust-on-old-kernels.patch b/patches/0002-disable-dump-adjust-on-old-kernels.patch
index ba34a516..4766e4c8 100644
--- a/patches/0002-disable-dump-adjust-on-old-kernels.patch
+++ b/patches/0002-disable-dump-adjust-on-old-kernels.patch
@@ -28,7 +28,7 @@  Date:   Fri Mar 1 14:03:49 2013 +0100
 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -2680,6 +2680,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2683,6 +2683,7 @@ static int nl80211_dump_wiphy(struct sk_
  						 cb->nlh->nlmsg_seq,
  						 NLM_F_MULTI, state);
  			if (ret < 0) {
@@ -36,7 +36,7 @@  Date:   Fri Mar 1 14:03:49 2013 +0100
  				/*
  				 * If sending the wiphy data didn't fit (ENOBUFS
  				 * or EMSGSIZE returned), this SKB is still
-@@ -2701,6 +2702,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2704,6 +2705,7 @@ static int nl80211_dump_wiphy(struct sk_
  					rtnl_unlock();
  					return 1;
  				}
diff --git a/patches/0014-netlink_seq/net_wireless_nl80211.patch b/patches/0014-netlink_seq/net_wireless_nl80211.patch
index e21045f9..f5ed7e2c 100644
--- a/patches/0014-netlink_seq/net_wireless_nl80211.patch
+++ b/patches/0014-netlink_seq/net_wireless_nl80211.patch
@@ -1,6 +1,6 @@ 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -9038,7 +9038,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -9042,7 +9042,9 @@ static int nl80211_dump_scan(struct sk_b
  	if (start == 0)
  		cfg80211_bss_expire(rdev);
  
diff --git a/patches/0071-skb-head_frag/wireless.patch b/patches/0071-skb-head_frag/wireless.patch
index c4c49d99..83630eb8 100644
--- a/patches/0071-skb-head_frag/wireless.patch
+++ b/patches/0071-skb-head_frag/wireless.patch
@@ -1,6 +1,6 @@ 
 --- a/net/wireless/util.c
 +++ b/net/wireless/util.c
-@@ -676,7 +676,11 @@ void ieee80211_amsdu_to_8023s(struct sk_
+@@ -678,7 +678,11 @@ void ieee80211_amsdu_to_8023s(struct sk_
  	u8 *payload;
  	int offset = 0, remaining;
  	struct ethhdr eth;
diff --git a/patches/0077-genl-ro-after-init/nl80211.patch b/patches/0077-genl-ro-after-init/nl80211.patch
index bbc46c13..0864dca0 100644
--- a/patches/0077-genl-ro-after-init/nl80211.patch
+++ b/patches/0077-genl-ro-after-init/nl80211.patch
@@ -1,6 +1,6 @@ 
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -15242,7 +15242,7 @@ static const struct genl_ops nl80211_ops
+@@ -15246,7 +15246,7 @@ static const struct genl_ops nl80211_ops
  	},
  };