summaryrefslogtreecommitdiff
path: root/patches/0002-disable-dump-adjust-on-old-kernels.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-11-30 22:25:54 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2018-12-06 22:54:26 +0100
commit9035c08635eaaf6d381fac54febf5816dcc4fae6 (patch)
tree9da04f20e16fb1c0f0cbf5198a4fff41e4d65af8 /patches/0002-disable-dump-adjust-on-old-kernels.patch
parentb198137b5b0011ed7ea8b58f2b6a3e391ceec662 (diff)
backports: Refresh patches on kernel 4.20-rc4
This patch was merged upstream and removed from backports: * patches/0090-use-skb_pad.patch This patch was manually modified: * patches/0025-usb-sg/usbnet.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/0002-disable-dump-adjust-on-old-kernels.patch')
-rw-r--r--patches/0002-disable-dump-adjust-on-old-kernels.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/0002-disable-dump-adjust-on-old-kernels.patch b/patches/0002-disable-dump-adjust-on-old-kernels.patch
index be1d9720..fa379bfe 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
-@@ -2174,6 +2174,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2204,6 +2204,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
-@@ -2195,6 +2196,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2225,6 +2226,7 @@ static int nl80211_dump_wiphy(struct sk_
rtnl_unlock();
return 1;
}