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.patch46
1 files changed, 23 insertions, 23 deletions
diff --git a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
index 788ae617..71cf119a 100644
--- a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
+++ b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch
@@ -36,7 +36,7 @@
dev, wdev) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2435,7 +2435,7 @@ static int nl80211_new_interface(struct
+@@ -2445,7 +2445,7 @@ static int nl80211_new_interface(struct
break;
}
@@ -45,7 +45,7 @@
rdev, wdev) < 0) {
nlmsg_free(msg);
return -ENOBUFS;
-@@ -2570,7 +2570,7 @@ static int nl80211_get_key(struct sk_buf
+@@ -2580,7 +2580,7 @@ static int nl80211_get_key(struct sk_buf
if (!msg)
return -ENOMEM;
@@ -54,7 +54,7 @@
NL80211_CMD_NEW_KEY);
if (IS_ERR(hdr))
return PTR_ERR(hdr);
-@@ -3542,7 +3542,7 @@ static int nl80211_dump_station(struct s
+@@ -3552,7 +3552,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)
-@@ -3588,7 +3588,7 @@ static int nl80211_get_station(struct sk
+@@ -3598,7 +3598,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;
-@@ -4194,7 +4194,7 @@ static int nl80211_dump_mpath(struct sk_
+@@ -4204,7 +4204,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)
-@@ -4243,7 +4243,7 @@ static int nl80211_get_mpath(struct sk_b
+@@ -4253,7 +4253,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;
-@@ -4507,7 +4507,7 @@ static int nl80211_get_mesh_config(struc
+@@ -4517,7 +4517,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;
-@@ -4860,7 +4860,7 @@ static int nl80211_get_reg(struct sk_buf
+@@ -4870,7 +4870,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;
-@@ -5539,7 +5539,7 @@ static int nl80211_send_bss(struct sk_bu
+@@ -5549,7 +5549,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;
-@@ -5775,7 +5775,7 @@ static int nl80211_dump_survey(struct sk
+@@ -5785,7 +5785,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;
-@@ -6442,7 +6442,7 @@ static int nl80211_testmode_dump(struct
+@@ -6452,7 +6452,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;
-@@ -6521,7 +6521,7 @@ struct sk_buff *cfg80211_testmode_alloc_
+@@ -6531,7 +6531,7 @@ struct sk_buff *cfg80211_testmode_alloc_
return NULL;
return __cfg80211_testmode_alloc_skb(rdev, approxlen,
@@ -144,7 +144,7 @@
rdev->testmode_info->snd_seq,
GFP_KERNEL);
}
-@@ -6887,7 +6887,7 @@ static int nl80211_remain_on_channel(str
+@@ -6897,7 +6897,7 @@ static int nl80211_remain_on_channel(str
if (!msg)
return -ENOMEM;
@@ -153,7 +153,7 @@
NL80211_CMD_REMAIN_ON_CHANNEL);
if (IS_ERR(hdr)) {
-@@ -7106,7 +7106,7 @@ static int nl80211_register_mgmt(struct
+@@ -7116,7 +7116,7 @@ static int nl80211_register_mgmt(struct
if (!rdev->ops->mgmt_tx)
return -EOPNOTSUPP;
@@ -162,7 +162,7 @@
nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]),
nla_len(info->attrs[NL80211_ATTR_FRAME_MATCH]));
}
-@@ -7176,7 +7176,7 @@ static int nl80211_tx_mgmt(struct sk_buf
+@@ -7186,7 +7186,7 @@ static int nl80211_tx_mgmt(struct sk_buf
if (!msg)
return -ENOMEM;
@@ -171,7 +171,7 @@
NL80211_CMD_FRAME);
if (IS_ERR(hdr)) {
-@@ -7291,7 +7291,7 @@ static int nl80211_get_power_save(struct
+@@ -7301,7 +7301,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;
-@@ -7586,7 +7586,7 @@ static int nl80211_get_wowlan(struct sk_
+@@ -7596,7 +7596,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;
-@@ -8012,7 +8012,7 @@ static int nl80211_register_unexpected_f
+@@ -8022,7 +8022,7 @@ static int nl80211_register_unexpected_f
if (wdev->ap_unexpected_nlportid)
return -EBUSY;
@@ -198,7 +198,7 @@
return 0;
}
-@@ -8042,7 +8042,7 @@ static int nl80211_probe_client(struct s
+@@ -8052,7 +8052,7 @@ static int nl80211_probe_client(struct s
if (!msg)
return -ENOMEM;
@@ -207,7 +207,7 @@
NL80211_CMD_PROBE_CLIENT);
if (IS_ERR(hdr)) {
-@@ -8086,13 +8086,13 @@ static int nl80211_register_beacons(stru
+@@ -8096,13 +8096,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);
-@@ -8159,7 +8159,7 @@ static int nl80211_get_protocol_features
+@@ -8169,7 +8169,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;
-@@ -8234,7 +8234,7 @@ static int nl80211_crit_protocol_start(s
+@@ -8244,7 +8244,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;
}
-@@ -10633,12 +10633,12 @@ static int nl80211_netlink_notify(struct
+@@ -10643,12 +10643,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)