aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-04-11 20:27:23 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-11 20:27:23 +0200
commitffb89fd9d56485efab865c3962e3f16dd5e22f9f (patch)
treea5415333010b31bec324e9f59c6b23f9304eee12
parentf1fcf8ee98aed42c2dd1cb36979ec673f932ced0 (diff)
downloadbackports-linux-4.19.y.tar.gz
backports: Refresh patches on top of 4.19.237v4.19.237-1linux-4.19.y
No manual changes needed. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/0077-genl-ro-after-init/hwsim.patch2
-rw-r--r--patches/0077-genl-ro-after-init/nl80211.patch2
-rw-r--r--patches/0085-iwlwifi-pci-device-removal.patch4
3 files changed, 4 insertions, 4 deletions
diff --git a/patches/0077-genl-ro-after-init/hwsim.patch b/patches/0077-genl-ro-after-init/hwsim.patch
index 986e2a04..ec9745c2 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[]
+@@ -3566,7 +3566,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 04700b47..618da566 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
-@@ -13988,7 +13988,7 @@ static const struct genl_ops nl80211_ops
+@@ -14000,7 +14000,7 @@ static const struct genl_ops nl80211_ops
},
};
diff --git a/patches/0085-iwlwifi-pci-device-removal.patch b/patches/0085-iwlwifi-pci-device-removal.patch
index 1f82b29c..8f2bcefa 100644
--- a/patches/0085-iwlwifi-pci-device-removal.patch
+++ b/patches/0085-iwlwifi-pci-device-removal.patch
@@ -2,7 +2,7 @@ diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wirel
index cc8c53dc0ab6..68296b65a680 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-@@ -1971,6 +1971,9 @@ static void iwl_trans_pcie_removal_wk(st
+@@ -1970,6 +1970,9 @@ static void iwl_trans_pcie_removal_wk(st
struct iwl_trans_pcie_removal *removal =
container_of(wk, struct iwl_trans_pcie_removal, work);
struct pci_dev *pdev = removal->pdev;
@@ -12,7 +12,7 @@ index cc8c53dc0ab6..68296b65a680 100644
char *prop[] = {"EVENT=INACCESSIBLE", NULL};
dev_err(&pdev->dev, "Device gone - attempting removal\n");
-@@ -1979,6 +1982,7 @@ static void iwl_trans_pcie_removal_wk(st
+@@ -1978,6 +1981,7 @@ static void iwl_trans_pcie_removal_wk(st
pci_dev_put(pdev);
pci_stop_and_remove_bus_device(pdev);
pci_unlock_rescan_remove();