aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-04-22 13:18:38 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2020-04-22 13:18:38 +0200
commit41514d1d06684da05842ffeed0f1572a661b012a (patch)
treef4b12376c0c4b1a4be933c3cb6706b679852c83a
parentabe05f0c83f5947f84cc0e6408ee0930595389b7 (diff)
downloadbackports-linux-5.5.y.tar.gz
backports: patches: Refresh on kernel 5.5.19v5.5.19-1linux-5.5.y
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/0002-disable-dump-adjust-on-old-kernels.patch4
-rw-r--r--patches/0014-netlink_seq/net_wireless_nl80211.patch2
-rw-r--r--patches/0077-genl-ro-after-init/nl80211.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/patches/0002-disable-dump-adjust-on-old-kernels.patch b/patches/0002-disable-dump-adjust-on-old-kernels.patch
index 3d752359..f9e6a4e3 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
-@@ -2549,6 +2549,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2547,6 +2547,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
-@@ -2570,6 +2571,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2568,6 +2569,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 28416330..5ed2ea0d 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
-@@ -8780,7 +8780,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -8778,7 +8778,9 @@ static int nl80211_dump_scan(struct sk_b
if (start == 0)
cfg80211_bss_expire(rdev);
diff --git a/patches/0077-genl-ro-after-init/nl80211.patch b/patches/0077-genl-ro-after-init/nl80211.patch
index e4071840..769503b8 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
-@@ -14768,7 +14768,7 @@ static const struct genl_ops nl80211_ops
+@@ -14766,7 +14766,7 @@ static const struct genl_ops nl80211_ops
},
};