summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch')
-rw-r--r--patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch70
1 files changed, 35 insertions, 35 deletions
diff --git a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
index 4664bc12..fd24df08 100644
--- a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
+++ b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1595,7 +1595,7 @@ static int nl80211_dump_wiphy(struct sk_
/* attempt to fit multiple wiphy data chunks into the skb */
do {
ret = nl80211_send_wiphy(dev, skb,
@@ -9,7 +9,7 @@
cb->nlh->nlmsg_seq,
NLM_F_MULTI, state);
if (ret < 0) {
-@@ -1646,7 +1646,7 @@ static int nl80211_get_wiphy(struct sk_b
+@@ -1648,7 +1648,7 @@ static int nl80211_get_wiphy(struct sk_b
if (!msg)
return -ENOMEM;
@@ -18,7 +18,7 @@
&state) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2221,7 +2221,7 @@ static int nl80211_dump_interface(struct
+@@ -2223,7 +2223,7 @@ static int nl80211_dump_interface(struct
if_idx++;
continue;
}
@@ -27,7 +27,7 @@
cb->nlh->nlmsg_seq, NLM_F_MULTI,
rdev, wdev) < 0) {
goto out;
-@@ -2250,7 +2250,7 @@ static int nl80211_get_interface(struct
+@@ -2252,7 +2252,7 @@ static int nl80211_get_interface(struct
if (!msg)
return -ENOMEM;
@@ -36,7 +36,7 @@
dev, wdev) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2483,7 +2483,7 @@ static int nl80211_new_interface(struct
+@@ -2485,7 +2485,7 @@ static int nl80211_new_interface(struct
break;
}
@@ -45,16 +45,16 @@
rdev, wdev) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2618,7 +2618,7 @@ static int nl80211_get_key(struct sk_buf
+@@ -2620,7 +2620,7 @@ static int nl80211_get_key(struct sk_buf
if (!msg)
return -ENOMEM;
- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0,
NL80211_CMD_NEW_KEY);
- if (IS_ERR(hdr))
- return PTR_ERR(hdr);
-@@ -3587,7 +3587,7 @@ static int nl80211_dump_station(struct s
+ if (!hdr)
+ return -ENOBUFS;
+@@ -3589,7 +3589,7 @@ static int nl80211_dump_station(struct s
goto out_err;
if (nl80211_send_station(skb,
@@ -63,7 +63,7 @@
cb->nlh->nlmsg_seq, NLM_F_MULTI,
dev, wdev->netdev, mac_addr,
&sinfo) < 0)
-@@ -3633,7 +3633,7 @@ static int nl80211_get_station(struct sk
+@@ -3635,7 +3635,7 @@ static int nl80211_get_station(struct sk
if (!msg)
return -ENOMEM;
@@ -72,7 +72,7 @@
rdev, dev, mac_addr, &sinfo) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -4241,7 +4241,7 @@ static int nl80211_dump_mpath(struct sk_
+@@ -4243,7 +4243,7 @@ static int nl80211_dump_mpath(struct sk_
if (err)
goto out_err;
@@ -81,7 +81,7 @@
cb->nlh->nlmsg_seq, NLM_F_MULTI,
wdev->netdev, dst, next_hop,
&pinfo) < 0)
-@@ -4290,7 +4290,7 @@ static int nl80211_get_mpath(struct sk_b
+@@ -4292,7 +4292,7 @@ static int nl80211_get_mpath(struct sk_b
if (!msg)
return -ENOMEM;
@@ -90,7 +90,7 @@
dev, dst, next_hop, &pinfo) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -4554,7 +4554,7 @@ static int nl80211_get_mesh_config(struc
+@@ -4556,7 +4556,7 @@ static int nl80211_get_mesh_config(struc
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
if (!msg)
return -ENOMEM;
@@ -99,7 +99,7 @@
NL80211_CMD_GET_MESH_CONFIG);
if (!hdr)
goto out;
-@@ -4913,7 +4913,7 @@ static int nl80211_get_reg(struct sk_buf
+@@ -4915,7 +4915,7 @@ static int nl80211_get_reg(struct sk_buf
if (!msg)
return -ENOBUFS;
@@ -108,7 +108,7 @@
NL80211_CMD_GET_REG);
if (!hdr)
goto put_failure;
-@@ -5592,7 +5592,7 @@ static int nl80211_send_bss(struct sk_bu
+@@ -5594,7 +5594,7 @@ static int nl80211_send_bss(struct sk_bu
ASSERT_WDEV_LOCK(wdev);
@@ -117,7 +117,7 @@
NL80211_CMD_NEW_SCAN_RESULTS);
if (!hdr)
return -1;
-@@ -5828,7 +5828,7 @@ static int nl80211_dump_survey(struct sk
+@@ -5830,7 +5830,7 @@ static int nl80211_dump_survey(struct sk
}
if (nl80211_send_survey(skb,
@@ -126,7 +126,7 @@
cb->nlh->nlmsg_seq, NLM_F_MULTI,
wdev->netdev, &survey) < 0)
goto out;
-@@ -6500,7 +6500,7 @@ static int nl80211_testmode_dump(struct
+@@ -6502,7 +6502,7 @@ static int nl80211_testmode_dump(struct
}
while (1) {
@@ -135,7 +135,7 @@
cb->nlh->nlmsg_seq, NLM_F_MULTI,
NL80211_CMD_TESTMODE);
struct nlattr *tmdata;
-@@ -6579,7 +6579,7 @@ struct sk_buff *cfg80211_testmode_alloc_
+@@ -6584,7 +6584,7 @@ struct sk_buff *cfg80211_testmode_alloc_
return NULL;
return __cfg80211_testmode_alloc_skb(rdev, approxlen,
@@ -144,16 +144,16 @@
rdev->testmode_info->snd_seq,
GFP_KERNEL);
}
-@@ -6947,7 +6947,7 @@ static int nl80211_remain_on_channel(str
+@@ -6952,7 +6952,7 @@ static int nl80211_remain_on_channel(str
if (!msg)
return -ENOMEM;
- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0,
NL80211_CMD_REMAIN_ON_CHANNEL);
-
- if (IS_ERR(hdr)) {
-@@ -7166,7 +7166,7 @@ static int nl80211_register_mgmt(struct
+ if (!hdr) {
+ err = -ENOBUFS;
+@@ -7170,7 +7170,7 @@ static int nl80211_register_mgmt(struct
if (!rdev->ops->mgmt_tx)
return -EOPNOTSUPP;
@@ -162,16 +162,16 @@
nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]),
nla_len(info->attrs[NL80211_ATTR_FRAME_MATCH]));
}
-@@ -7247,7 +7247,7 @@ static int nl80211_tx_mgmt(struct sk_buf
+@@ -7251,7 +7251,7 @@ static int nl80211_tx_mgmt(struct sk_buf
if (!msg)
return -ENOMEM;
- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0,
NL80211_CMD_FRAME);
-
- if (IS_ERR(hdr)) {
-@@ -7362,7 +7362,7 @@ static int nl80211_get_power_save(struct
+ if (!hdr) {
+ err = -ENOBUFS;
+@@ -7365,7 +7365,7 @@ static int nl80211_get_power_save(struct
if (!msg)
return -ENOMEM;
@@ -180,7 +180,7 @@
NL80211_CMD_GET_POWER_SAVE);
if (!hdr) {
err = -ENOBUFS;
-@@ -7673,7 +7673,7 @@ static int nl80211_get_wowlan(struct sk_
+@@ -7676,7 +7676,7 @@ static int nl80211_get_wowlan(struct sk_
if (!msg)
return -ENOMEM;
@@ -189,7 +189,7 @@
NL80211_CMD_GET_WOWLAN);
if (!hdr)
goto nla_put_failure;
-@@ -8098,7 +8098,7 @@ static int nl80211_register_unexpected_f
+@@ -8101,7 +8101,7 @@ static int nl80211_register_unexpected_f
if (wdev->ap_unexpected_nlportid)
return -EBUSY;
@@ -198,16 +198,16 @@
return 0;
}
-@@ -8128,7 +8128,7 @@ static int nl80211_probe_client(struct s
+@@ -8131,7 +8131,7 @@ static int nl80211_probe_client(struct s
if (!msg)
return -ENOMEM;
- hdr = nl80211hdr_put(msg, info->snd_portid, info->snd_seq, 0,
+ hdr = nl80211hdr_put(msg, genl_info_snd_portid(info), info->snd_seq, 0,
NL80211_CMD_PROBE_CLIENT);
-
- if (IS_ERR(hdr)) {
-@@ -8172,13 +8172,13 @@ static int nl80211_register_beacons(stru
+ if (!hdr) {
+ err = -ENOBUFS;
+@@ -8174,13 +8174,13 @@ static int nl80211_register_beacons(stru
/* First, check if already registered. */
spin_lock_bh(&rdev->beacon_registrations_lock);
list_for_each_entry(reg, &rdev->beacon_registrations, list) {
@@ -223,7 +223,7 @@
list_add(&nreg->list, &rdev->beacon_registrations);
spin_unlock_bh(&rdev->beacon_registrations_lock);
-@@ -8245,7 +8245,7 @@ static int nl80211_get_protocol_features
+@@ -8247,7 +8247,7 @@ static int nl80211_get_protocol_features
if (!msg)
return -ENOMEM;
@@ -232,7 +232,7 @@
NL80211_CMD_GET_PROTOCOL_FEATURES);
if (!hdr)
goto nla_put_failure;
-@@ -8320,7 +8320,7 @@ static int nl80211_crit_protocol_start(s
+@@ -8322,7 +8322,7 @@ static int nl80211_crit_protocol_start(s
ret = rdev_crit_proto_start(rdev, wdev, proto, duration);
if (!ret)
@@ -241,7 +241,7 @@
return ret;
}
-@@ -10696,12 +10696,12 @@ static int nl80211_netlink_notify(struct
+@@ -10698,12 +10698,12 @@ static int nl80211_netlink_notify(struct
list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) {
list_for_each_entry_rcu(wdev, &rdev->wdev_list, list)
generated by cgit v1.2.3 (git 2.0.4) at 2024-04-26 05:58:53 +0000