summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-03-12 12:41:43 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2020-03-21 15:31:24 +0100
commitf6e8852f1ef28e6d3c9bae8400eb6a87a6b0c3e7 (patch)
treecca4de25072f4b8241339e2d089176c06d69cd86
parent3182385a8b126af62333f39a548d391888da5af9 (diff)
patches: Refresh on top of kernel 5.4.27linux-5.4.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/0003-cfg80211-wext-padding/include_net_cfg80211.patch2
-rw-r--r--patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch2
-rw-r--r--patches/0014-netlink_seq/net_wireless_nl80211.patch2
-rw-r--r--patches/0028-select_queue/mwifiex.patch2
-rw-r--r--patches/0053-possible_net_t.patch2
-rw-r--r--patches/0055-name_assign_type/brcmfmac.patch2
-rw-r--r--patches/0077-genl-ro-after-init/nl80211.patch2
-rw-r--r--patches/0085-iwlwifi-pci-device-removal.patch4
-rw-r--r--patches/lib-refcount.patch4
10 files changed, 13 insertions, 13 deletions
diff --git a/patches/0002-disable-dump-adjust-on-old-kernels.patch b/patches/0002-disable-dump-adjust-on-old-kernels.patch
index 04103f35..77ac1cb8 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
-@@ -2542,6 +2542,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2548,6 +2548,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
-@@ -2563,6 +2564,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2569,6 +2570,7 @@ static int nl80211_dump_wiphy(struct sk_
rtnl_unlock();
return 1;
}
diff --git a/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch b/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch
index ab2b79ff..915a5111 100644
--- a/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch
+++ b/patches/0003-cfg80211-wext-padding/include_net_cfg80211.patch
@@ -1,6 +1,6 @@
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -4536,6 +4536,9 @@ struct cfg80211_pmsr_capabilities {
+@@ -4541,6 +4541,9 @@ struct cfg80211_pmsr_capabilities {
struct wiphy {
/* assign these fields before you register the wiphy */
diff --git a/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
index c5d8ddf9..6b14d347 100644
--- a/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
+++ b/patches/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
@@ -11,7 +11,7 @@
device_initialize(&rdev->wiphy.dev);
rdev->wiphy.dev.class = &ieee80211_class;
rdev->wiphy.dev.platform_data = rdev;
-@@ -1295,6 +1291,15 @@ static int cfg80211_netdev_notifier_call
+@@ -1296,6 +1292,15 @@ static int cfg80211_netdev_notifier_call
}
wdev->netdev = dev;
#ifdef CONFIG_CFG80211_WEXT
diff --git a/patches/0014-netlink_seq/net_wireless_nl80211.patch b/patches/0014-netlink_seq/net_wireless_nl80211.patch
index 8b7c33b0..4384d6ea 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
-@@ -8765,7 +8765,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -8771,7 +8771,9 @@ static int nl80211_dump_scan(struct sk_b
if (start == 0)
cfg80211_bss_expire(rdev);
diff --git a/patches/0028-select_queue/mwifiex.patch b/patches/0028-select_queue/mwifiex.patch
index 0b4e9838..ffcb4cbb 100644
--- a/patches/0028-select_queue/mwifiex.patch
+++ b/patches/0028-select_queue/mwifiex.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
-@@ -1276,9 +1276,28 @@ static struct net_device_stats *mwifiex_
+@@ -1277,9 +1277,28 @@ static struct net_device_stats *mwifiex_
return &priv->stats;
}
diff --git a/patches/0053-possible_net_t.patch b/patches/0053-possible_net_t.patch
index 85e6c24c..bd19f20b 100644
--- a/patches/0053-possible_net_t.patch
+++ b/patches/0053-possible_net_t.patch
@@ -2,7 +2,7 @@ diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 04e5785..a251da1 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -4685,12 +4685,12 @@ struct wiphy {
+@@ -4690,12 +4690,12 @@ struct wiphy {
static inline struct net *wiphy_net(struct wiphy *wiphy)
{
diff --git a/patches/0055-name_assign_type/brcmfmac.patch b/patches/0055-name_assign_type/brcmfmac.patch
index c242a44a..c9619b1c 100644
--- a/patches/0055-name_assign_type/brcmfmac.patch
+++ b/patches/0055-name_assign_type/brcmfmac.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-@@ -2219,7 +2219,9 @@ struct wireless_dev *brcmf_p2p_add_vif(s
+@@ -2220,7 +2220,9 @@ struct wireless_dev *brcmf_p2p_add_vif(s
}
strncpy(ifp->ndev->name, name, sizeof(ifp->ndev->name) - 1);
diff --git a/patches/0077-genl-ro-after-init/nl80211.patch b/patches/0077-genl-ro-after-init/nl80211.patch
index eee2ee3c..555ea930 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
-@@ -14750,7 +14750,7 @@ static const struct genl_ops nl80211_ops
+@@ -14759,7 +14759,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 f858fe99..9285b684 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 f74281508197..3b11bd68f261 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
-@@ -1998,6 +1998,9 @@ static void iwl_trans_pcie_removal_wk(st
+@@ -2029,6 +2029,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 f74281508197..3b11bd68f261 100644
static char *prop[] = {"EVENT=INACCESSIBLE", NULL};
dev_err(&pdev->dev, "Device gone - attempting removal\n");
-@@ -2006,6 +2009,7 @@ static void iwl_trans_pcie_removal_wk(st
+@@ -2037,6 +2040,7 @@ static void iwl_trans_pcie_removal_wk(st
pci_dev_put(pdev);
pci_stop_and_remove_bus_device(pdev);
pci_unlock_rescan_remove();
diff --git a/patches/lib-refcount.patch b/patches/lib-refcount.patch
index 0f63ec6a..020b9af2 100644
--- a/patches/lib-refcount.patch
+++ b/patches/lib-refcount.patch
@@ -10,7 +10,7 @@ index 5d0582a..8d108f9 100644
/**
* refcount_add_not_zero_checked - add a value to a refcount unless it is 0
-@@ -153,6 +153,8 @@ bool refcount_dec_and_lock(refcount_t *r, spinlock_t *lock)
+@@ -353,6 +354,8 @@ bool refcount_dec_and_lock(refcount_t *r
return false;
}
@@ -19,7 +19,7 @@ index 5d0582a..8d108f9 100644
return true;
}
EXPORT_SYMBOL(refcount_dec_and_lock);
-@@ -182,6 +184,8 @@ bool refcount_dec_and_lock_irqsave(refcount_t *r, spinlock_t *lock,
+@@ -382,6 +385,8 @@ bool refcount_dec_and_lock_irqsave(refco
return false;
}