mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 14:04:26 -04:00
fb45887e85
Update backports to the latest 6.6 point release. Signed-off-by: Robert Marko <robimarko@gmail.com> Signed-off-by: Felix Fietkau <nbd@nbd.name>
25 lines
873 B
Diff
25 lines
873 B
Diff
--- a/drivers/net/wireless/virtual/mac80211_hwsim.c
|
|
+++ b/drivers/net/wireless/virtual/mac80211_hwsim.c
|
|
@@ -6179,7 +6179,9 @@ static struct genl_family hwsim_genl_fam
|
|
.module = THIS_MODULE,
|
|
.small_ops = hwsim_ops,
|
|
.n_small_ops = ARRAY_SIZE(hwsim_ops),
|
|
+#if LINUX_VERSION_IS_GEQ(6,1,0)
|
|
.resv_start_op = HWSIM_CMD_REPORT_PMSR + 1, // match with __HWSIM_CMD_MAX
|
|
+#endif
|
|
.mcgrps = hwsim_mcgrps,
|
|
.n_mcgrps = ARRAY_SIZE(hwsim_mcgrps),
|
|
};
|
|
--- a/net/wireless/nl80211.c
|
|
+++ b/net/wireless/nl80211.c
|
|
@@ -17551,7 +17551,9 @@ static struct genl_family nl80211_fam __
|
|
.n_ops = ARRAY_SIZE(nl80211_ops),
|
|
.small_ops = nl80211_small_ops,
|
|
.n_small_ops = ARRAY_SIZE(nl80211_small_ops),
|
|
+#if LINUX_VERSION_IS_GEQ(6,1,0)
|
|
.resv_start_op = NL80211_CMD_REMOVE_LINK_STA + 1,
|
|
+#endif
|
|
.mcgrps = nl80211_mcgrps,
|
|
.n_mcgrps = ARRAY_SIZE(nl80211_mcgrps),
|
|
.parallel_ops = true,
|