aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-11-27 18:59:40 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-12-03 17:03:36 +0100
commite1867d552f108f403725067c72ad2dc87535b935 (patch)
tree0a3a1f93aae5f785a192eab52d0422466871e111
parentda60273fc6af89c37a14f80aa7b76bb570e82968 (diff)
downloadbackports-e1867d552f108f403725067c72ad2dc87535b935.tar.gz
patches: Refresh on top of kernel 5.15.81v5.15.81-1
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--patches/0077-genl-ro-after-init/hwsim.patch2
-rw-r--r--patches/0079-netdev-destructor/brcmfmac.patch4
-rw-r--r--patches/0100-revert-small_ops/mac80211_hwsim.patch4
3 files changed, 5 insertions, 5 deletions
diff --git a/patches/0077-genl-ro-after-init/hwsim.patch b/patches/0077-genl-ro-after-init/hwsim.patch
index 049c8f26..1d00b43b 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
-@@ -4123,7 +4123,7 @@ static const struct genl_small_ops hwsim
+@@ -4128,7 +4128,7 @@ static const struct genl_small_ops hwsim
},
};
diff --git a/patches/0079-netdev-destructor/brcmfmac.patch b/patches/0079-netdev-destructor/brcmfmac.patch
index 1e16b92c..c67ae5b6 100644
--- a/patches/0079-netdev-destructor/brcmfmac.patch
+++ b/patches/0079-netdev-destructor/brcmfmac.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-@@ -638,6 +638,23 @@ static const struct net_device_ops brcmf
+@@ -639,6 +639,23 @@ static const struct net_device_ops brcmf
.ndo_set_rx_mode = brcmf_netdev_set_multicast_list
};
@@ -24,7 +24,7 @@
int brcmf_net_attach(struct brcmf_if *ifp, bool locked)
{
struct brcmf_pub *drvr = ifp->drvr;
-@@ -888,7 +905,11 @@ struct brcmf_if *brcmf_add_if(struct brc
+@@ -889,7 +906,11 @@ struct brcmf_if *brcmf_add_if(struct brc
if (!ndev)
return ERR_PTR(-ENOMEM);
diff --git a/patches/0100-revert-small_ops/mac80211_hwsim.patch b/patches/0100-revert-small_ops/mac80211_hwsim.patch
index f9c2c412..30a09e47 100644
--- a/patches/0100-revert-small_ops/mac80211_hwsim.patch
+++ b/patches/0100-revert-small_ops/mac80211_hwsim.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
-@@ -4086,7 +4086,11 @@ done:
+@@ -4091,7 +4091,11 @@ done:
}
/* Generic Netlink operations array */
@@ -12,7 +12,7 @@
{
.cmd = HWSIM_CMD_REGISTER,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
-@@ -4130,8 +4134,13 @@ static struct genl_family hwsim_genl_fam
+@@ -4135,8 +4139,13 @@ static struct genl_family hwsim_genl_fam
.policy = hwsim_genl_policy,
.netnsok = true,
.module = THIS_MODULE,