diff options
Diffstat (limited to 'patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch')
-rw-r--r-- | patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch b/patches/collateral-evolutions/network/0005-netlink-portid/nl80211.patch index 89c6213b..b932ad90 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 -@@ -1604,7 +1604,7 @@ static int nl80211_dump_wiphy(struct sk_ +@@ -1611,7 +1611,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, split, &cb->args[1], -@@ -1653,7 +1653,7 @@ static int nl80211_get_wiphy(struct sk_b +@@ -1660,7 +1660,7 @@ static int nl80211_get_wiphy(struct sk_b if (!msg) return -ENOMEM; @@ -18,7 +18,7 @@ false, NULL, NULL, NULL) < 0) { nlmsg_free(msg); return -ENOBUFS; -@@ -2233,7 +2233,7 @@ static int nl80211_dump_interface(struct +@@ -2240,7 +2240,7 @@ static int nl80211_dump_interface(struct if_idx++; continue; } @@ -27,7 +27,7 @@ cb->nlh->nlmsg_seq, NLM_F_MULTI, rdev, wdev) < 0) { mutex_unlock(&rdev->devlist_mtx); -@@ -2264,7 +2264,7 @@ static int nl80211_get_interface(struct +@@ -2271,7 +2271,7 @@ static int nl80211_get_interface(struct if (!msg) return -ENOMEM; @@ -36,7 +36,7 @@ dev, wdev) < 0) { nlmsg_free(msg); return -ENOBUFS; -@@ -2489,7 +2489,7 @@ static int nl80211_new_interface(struct +@@ -2496,7 +2496,7 @@ static int nl80211_new_interface(struct break; } @@ -45,7 +45,7 @@ rdev, wdev) < 0) { nlmsg_free(msg); return -ENOBUFS; -@@ -2624,7 +2624,7 @@ static int nl80211_get_key(struct sk_buf +@@ -2631,7 +2631,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); -@@ -3565,7 +3565,7 @@ static int nl80211_dump_station(struct s +@@ -3572,7 +3572,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) -@@ -3611,7 +3611,7 @@ static int nl80211_get_station(struct sk +@@ -3618,7 +3618,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; -@@ -4211,7 +4211,7 @@ static int nl80211_dump_mpath(struct sk_ +@@ -4218,7 +4218,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) -@@ -4260,7 +4260,7 @@ static int nl80211_get_mpath(struct sk_b +@@ -4267,7 +4267,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; -@@ -4524,7 +4524,7 @@ static int nl80211_get_mesh_config(struc +@@ -4531,7 +4531,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; -@@ -4874,7 +4874,7 @@ static int nl80211_get_reg(struct sk_buf +@@ -4881,7 +4881,7 @@ static int nl80211_get_reg(struct sk_buf goto out; } @@ -108,7 +108,7 @@ NL80211_CMD_GET_REG); if (!hdr) goto put_failure; -@@ -5574,7 +5574,7 @@ static int nl80211_send_bss(struct sk_bu +@@ -5581,7 +5581,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; -@@ -5810,7 +5810,7 @@ static int nl80211_dump_survey(struct sk +@@ -5817,7 +5817,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; -@@ -6468,7 +6468,7 @@ static int nl80211_testmode_dump(struct +@@ -6475,7 +6475,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; -@@ -6547,7 +6547,7 @@ struct sk_buff *cfg80211_testmode_alloc_ +@@ -6554,7 +6554,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); } -@@ -6907,7 +6907,7 @@ static int nl80211_remain_on_channel(str +@@ -6914,7 +6914,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)) { -@@ -7126,7 +7126,7 @@ static int nl80211_register_mgmt(struct +@@ -7133,7 +7133,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])); } -@@ -7196,7 +7196,7 @@ static int nl80211_tx_mgmt(struct sk_buf +@@ -7203,7 +7203,7 @@ static int nl80211_tx_mgmt(struct sk_buf if (!msg) return -ENOMEM; @@ -171,7 +171,7 @@ NL80211_CMD_FRAME); if (IS_ERR(hdr)) { -@@ -7311,7 +7311,7 @@ static int nl80211_get_power_save(struct +@@ -7318,7 +7318,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; -@@ -7603,7 +7603,7 @@ static int nl80211_get_wowlan(struct sk_ +@@ -7612,7 +7612,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; -@@ -8027,7 +8027,7 @@ static int nl80211_register_unexpected_f +@@ -8036,7 +8036,7 @@ static int nl80211_register_unexpected_f if (wdev->ap_unexpected_nlportid) return -EBUSY; @@ -198,7 +198,7 @@ return 0; } -@@ -8057,7 +8057,7 @@ static int nl80211_probe_client(struct s +@@ -8066,7 +8066,7 @@ static int nl80211_probe_client(struct s if (!msg) return -ENOMEM; @@ -207,7 +207,7 @@ NL80211_CMD_PROBE_CLIENT); if (IS_ERR(hdr)) { -@@ -8101,13 +8101,13 @@ static int nl80211_register_beacons(stru +@@ -8110,13 +8110,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); -@@ -8182,7 +8182,7 @@ static int nl80211_get_protocol_features +@@ -8191,7 +8191,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; -@@ -8257,7 +8257,7 @@ static int nl80211_crit_protocol_start(s +@@ -8266,7 +8266,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; } -@@ -10661,12 +10661,12 @@ static int nl80211_netlink_notify(struct +@@ -10672,12 +10672,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) |