summaryrefslogtreecommitdiff
path: root/patches/0077-genl-ro-after-init
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/0077-genl-ro-after-init
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/0077-genl-ro-after-init')
-rw-r--r--patches/0077-genl-ro-after-init/hwsim.patch2
-rw-r--r--patches/0077-genl-ro-after-init/nl80211.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/0077-genl-ro-after-init/hwsim.patch b/patches/0077-genl-ro-after-init/hwsim.patch
index 986e2a04..6a1b7022 100644
--- a/patches/0077-genl-ro-after-init/hwsim.patch
+++ b/patches/0077-genl-ro-after-init/hwsim.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -3553,7 +3553,7 @@ static const struct genl_ops hwsim_ops[]
+@@ -3546,7 +3546,7 @@ static const struct genl_ops hwsim_ops[]
},
};
diff --git a/patches/0077-genl-ro-after-init/nl80211.patch b/patches/0077-genl-ro-after-init/nl80211.patch
index bb9f9013..a897be35 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
-@@ -13906,7 +13906,7 @@ static const struct genl_ops nl80211_ops
+@@ -13904,7 +13904,7 @@ static const struct genl_ops nl80211_ops
},
};