aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-05-02 15:58:27 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-05-04 00:07:06 +0200
commit88fc8ee70f8a57ac803e629d67d61f8b5b2f1bd2 (patch)
tree2605e985c9cba17f85a1a4cfd8bfae2e02a3ceb7
parentfa0ac857060adac0805bd1dab9e3fbaa138e3c3c (diff)
downloadbackports-88fc8ee70f8a57ac803e629d67d61f8b5b2f1bd2.tar.gz
patches: Refresh on kernel 5.10.34
No manual changes needed. 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
-rw-r--r--patches/0089-unknown-dmi/brcmfmac.patch4
-rw-r--r--patches/0099-netlink-range/mac80211.patch6
-rw-r--r--patches/0100-revert-small_ops/mac80211.patch4
6 files changed, 11 insertions, 11 deletions
diff --git a/patches/0002-disable-dump-adjust-on-old-kernels.patch b/patches/0002-disable-dump-adjust-on-old-kernels.patch
index 36a2a928..2dea3fd1 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
-@@ -2767,6 +2767,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2771,6 +2771,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
-@@ -2788,6 +2789,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -2792,6 +2793,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 be1cd283..586b5501 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
-@@ -9312,7 +9312,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -9316,7 +9316,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 e2b52e39..65cc153c 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
-@@ -15526,7 +15526,7 @@ static const struct genl_small_ops nl802
+@@ -15530,7 +15530,7 @@ static const struct genl_small_ops nl802
},
};
diff --git a/patches/0089-unknown-dmi/brcmfmac.patch b/patches/0089-unknown-dmi/brcmfmac.patch
index 26ff4427..1fbb1992 100644
--- a/patches/0089-unknown-dmi/brcmfmac.patch
+++ b/patches/0089-unknown-dmi/brcmfmac.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
-@@ -46,7 +46,9 @@ static const struct dmi_system_id dmi_pl
+@@ -58,7 +58,9 @@ static const struct dmi_system_id dmi_pl
.matches = {
DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
@@ -10,7 +10,7 @@
/* also match on somewhat unique bios-version */
DMI_EXACT_MATCH(DMI_BIOS_VERSION, "1.000"),
},
-@@ -57,7 +59,9 @@ static const struct dmi_system_id dmi_pl
+@@ -69,7 +71,9 @@ static const struct dmi_system_id dmi_pl
.matches = {
DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "To be filled by O.E.M."),
DMI_EXACT_MATCH(DMI_BOARD_NAME, "Cherry Trail CR"),
diff --git a/patches/0099-netlink-range/mac80211.patch b/patches/0099-netlink-range/mac80211.patch
index 48afe208..1490baf0 100644
--- a/patches/0099-netlink-range/mac80211.patch
+++ b/patches/0099-netlink-range/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -387,9 +387,11 @@ static const struct nla_policy
+@@ -391,9 +391,11 @@ static const struct nla_policy
nl80211_fils_discovery_policy[NL80211_FILS_DISCOVERY_ATTR_MAX + 1] = {
[NL80211_FILS_DISCOVERY_ATTR_INT_MIN] = NLA_POLICY_MAX(NLA_U32, 10000),
[NL80211_FILS_DISCOVERY_ATTR_INT_MAX] = NLA_POLICY_MAX(NLA_U32, 10000),
@@ -12,7 +12,7 @@
};
static const struct nla_policy
-@@ -617,16 +619,26 @@ static const struct nla_policy nl80211_p
+@@ -621,16 +623,26 @@ static const struct nla_policy nl80211_p
* The value of the Length field of the Supported Operating
* Classes element is between 2 and 253.
*/
@@ -39,7 +39,7 @@
[NL80211_ATTR_MAC_HINT] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),
[NL80211_ATTR_WIPHY_FREQ_HINT] = { .type = NLA_U32 },
[NL80211_ATTR_TDLS_PEER_CAPABILITY] = { .type = NLA_U32 },
-@@ -681,10 +693,15 @@ static const struct nla_policy nl80211_p
+@@ -685,10 +697,15 @@ static const struct nla_policy nl80211_p
[NL80211_ATTR_TXQ_LIMIT] = { .type = NLA_U32 },
[NL80211_ATTR_TXQ_MEMORY_LIMIT] = { .type = NLA_U32 },
[NL80211_ATTR_TXQ_QUANTUM] = { .type = NLA_U32 },
diff --git a/patches/0100-revert-small_ops/mac80211.patch b/patches/0100-revert-small_ops/mac80211.patch
index 567aa8f9..f994ab94 100644
--- a/patches/0100-revert-small_ops/mac80211.patch
+++ b/patches/0100-revert-small_ops/mac80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -14691,9 +14691,11 @@ static const struct genl_ops nl80211_ops
+@@ -14695,9 +14695,11 @@ static const struct genl_ops nl80211_ops
.internal_flags = NL80211_FLAG_NEED_WIPHY |
NL80211_FLAG_NEED_RTNL,
},
@@ -12,7 +12,7 @@
{
.cmd = NL80211_CMD_SET_WIPHY,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-@@ -15555,8 +15557,10 @@ static struct genl_family nl80211_fam __
+@@ -15559,8 +15561,10 @@ static struct genl_family nl80211_fam __
.module = THIS_MODULE,
.ops = nl80211_ops,
.n_ops = ARRAY_SIZE(nl80211_ops),