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.patch72
1 files changed, 36 insertions, 36 deletions
diff --git a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
index b78e595b..26ddf9f4 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
-@@ -1630,7 +1630,7 @@ static int nl80211_dump_wiphy(struct sk_
+@@ -1637,7 +1637,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) {
-@@ -1683,7 +1683,7 @@ static int nl80211_get_wiphy(struct sk_b
+@@ -1690,7 +1690,7 @@ static int nl80211_get_wiphy(struct sk_b
if (!msg)
return -ENOMEM;
@@ -18,7 +18,7 @@
&state) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2258,7 +2258,7 @@ static int nl80211_dump_interface(struct
+@@ -2265,7 +2265,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;
-@@ -2287,7 +2287,7 @@ static int nl80211_get_interface(struct
+@@ -2294,7 +2294,7 @@ static int nl80211_get_interface(struct
if (!msg)
return -ENOMEM;
@@ -36,7 +36,7 @@
dev, wdev) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2520,7 +2520,7 @@ static int nl80211_new_interface(struct
+@@ -2527,7 +2527,7 @@ static int nl80211_new_interface(struct
break;
}
@@ -45,16 +45,16 @@
rdev, wdev) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2655,7 +2655,7 @@ static int nl80211_get_key(struct sk_buf
+@@ -2662,7 +2662,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);
-@@ -3624,7 +3624,7 @@ static int nl80211_dump_station(struct s
+ if (!hdr)
+ return -ENOBUFS;
+@@ -3631,7 +3631,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)
-@@ -3670,7 +3670,7 @@ static int nl80211_get_station(struct sk
+@@ -3677,7 +3677,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;
-@@ -4278,7 +4278,7 @@ static int nl80211_dump_mpath(struct sk_
+@@ -4285,7 +4285,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)
-@@ -4327,7 +4327,7 @@ static int nl80211_get_mpath(struct sk_b
+@@ -4334,7 +4334,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;
-@@ -4591,7 +4591,7 @@ static int nl80211_get_mesh_config(struc
+@@ -4598,7 +4598,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;
-@@ -4950,7 +4950,7 @@ static int nl80211_get_reg(struct sk_buf
+@@ -4957,7 +4957,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;
-@@ -5629,7 +5629,7 @@ static int nl80211_send_bss(struct sk_bu
+@@ -5741,7 +5741,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;
-@@ -5866,7 +5866,7 @@ static int nl80211_dump_survey(struct sk
+@@ -5978,7 +5978,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;
-@@ -6553,7 +6553,7 @@ static int nl80211_testmode_dump(struct
+@@ -6665,7 +6665,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;
-@@ -6632,7 +6632,7 @@ struct sk_buff *cfg80211_testmode_alloc_
+@@ -6747,7 +6747,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);
}
-@@ -7000,7 +7000,7 @@ static int nl80211_remain_on_channel(str
+@@ -7115,7 +7115,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)) {
-@@ -7219,7 +7219,7 @@ static int nl80211_register_mgmt(struct
+ if (!hdr) {
+ err = -ENOBUFS;
+@@ -7333,7 +7333,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]));
}
-@@ -7300,7 +7300,7 @@ static int nl80211_tx_mgmt(struct sk_buf
+@@ -7414,7 +7414,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)) {
-@@ -7415,7 +7415,7 @@ static int nl80211_get_power_save(struct
+ if (!hdr) {
+ err = -ENOBUFS;
+@@ -7528,7 +7528,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;
-@@ -7725,7 +7725,7 @@ static int nl80211_get_wowlan(struct sk_
+@@ -7838,7 +7838,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;
-@@ -8154,7 +8154,7 @@ static int nl80211_get_coalesce(struct s
+@@ -8267,7 +8267,7 @@ static int nl80211_get_coalesce(struct s
if (!msg)
return -ENOMEM;
@@ -198,7 +198,7 @@
NL80211_CMD_GET_COALESCE);
if (!hdr)
goto nla_put_failure;
-@@ -8407,7 +8407,7 @@ static int nl80211_register_unexpected_f
+@@ -8520,7 +8520,7 @@ static int nl80211_register_unexpected_f
if (wdev->ap_unexpected_nlportid)
return -EBUSY;
@@ -207,16 +207,16 @@
return 0;
}
-@@ -8437,7 +8437,7 @@ static int nl80211_probe_client(struct s
+@@ -8550,7 +8550,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)) {
-@@ -8481,13 +8481,13 @@ static int nl80211_register_beacons(stru
+ if (!hdr) {
+ err = -ENOBUFS;
+@@ -8593,13 +8593,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) {
@@ -232,7 +232,7 @@
list_add(&nreg->list, &rdev->beacon_registrations);
spin_unlock_bh(&rdev->beacon_registrations_lock);
-@@ -8554,7 +8554,7 @@ static int nl80211_get_protocol_features
+@@ -8666,7 +8666,7 @@ static int nl80211_get_protocol_features
if (!msg)
return -ENOMEM;
@@ -241,7 +241,7 @@
NL80211_CMD_GET_PROTOCOL_FEATURES);
if (!hdr)
goto nla_put_failure;
-@@ -8629,7 +8629,7 @@ static int nl80211_crit_protocol_start(s
+@@ -8741,7 +8741,7 @@ static int nl80211_crit_protocol_start(s
ret = rdev_crit_proto_start(rdev, wdev, proto, duration);
if (!ret)
@@ -250,7 +250,7 @@
return ret;
}
-@@ -11020,12 +11020,12 @@ static int nl80211_netlink_notify(struct
+@@ -11140,12 +11140,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-25 02:04:06 +0000