1 From: Felix Fietkau <nbd@openwrt.org>
2 Date: Mon, 24 Nov 2014 18:09:03 +0100
3 Subject: [PATCH] mac80211: copy chandef from AP vif to VLANs
5 Fixes a crash in nl80211_send_chandef, introduced in
7 commit c12bc4885f4b3bab0ed779c69d5d7e3223fa5003
8 "mac80211: return the vif's chandef in ieee80211_cfg_get_channel()"
10 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
13 --- a/net/mac80211/chan.c
14 +++ b/net/mac80211/chan.c
15 @@ -932,6 +932,21 @@ ieee80211_vif_chanctx_reservation_comple
20 +ieee80211_vif_update_chandef(struct ieee80211_sub_if_data *sdata,
21 + const struct cfg80211_chan_def *chandef)
23 + struct ieee80211_sub_if_data *vlan;
25 + sdata->vif.bss_conf.chandef = *chandef;
27 + if (sdata->vif.type != NL80211_IFTYPE_AP)
30 + list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list)
31 + vlan->vif.bss_conf.chandef = *chandef;
35 ieee80211_vif_use_reserved_reassign(struct ieee80211_sub_if_data *sdata)
37 @@ -994,7 +1009,7 @@ ieee80211_vif_use_reserved_reassign(stru
38 if (sdata->vif.bss_conf.chandef.width != sdata->reserved_chandef.width)
39 changed = BSS_CHANGED_BANDWIDTH;
41 - sdata->vif.bss_conf.chandef = sdata->reserved_chandef;
42 + ieee80211_vif_update_chandef(sdata, &sdata->reserved_chandef);
45 ieee80211_bss_info_change_notify(sdata, changed);
46 @@ -1336,7 +1351,7 @@ static int ieee80211_vif_use_reserved_sw
47 sdata->reserved_chandef.width)
48 changed = BSS_CHANGED_BANDWIDTH;
50 - sdata->vif.bss_conf.chandef = sdata->reserved_chandef;
51 + ieee80211_vif_update_chandef(sdata, &sdata->reserved_chandef);
53 ieee80211_bss_info_change_notify(sdata,
55 @@ -1507,7 +1522,7 @@ int ieee80211_vif_use_channel(struct iee
59 - sdata->vif.bss_conf.chandef = *chandef;
60 + ieee80211_vif_update_chandef(sdata, chandef);
62 ret = ieee80211_assign_vif_chanctx(sdata, ctx);
64 @@ -1649,7 +1664,7 @@ int ieee80211_vif_change_bandwidth(struc
68 - sdata->vif.bss_conf.chandef = *chandef;
69 + ieee80211_vif_update_chandef(sdata, chandef);
71 ieee80211_recalc_chanctx_chantype(local, ctx);
73 --- a/net/mac80211/iface.c
74 +++ b/net/mac80211/iface.c
75 @@ -520,6 +520,7 @@ int ieee80211_do_open(struct wireless_de
76 sdata->vif.cab_queue = master->vif.cab_queue;
77 memcpy(sdata->vif.hw_queue, master->vif.hw_queue,
78 sizeof(sdata->vif.hw_queue));
79 + sdata->vif.bss_conf.chandef = master->vif.bss_conf.chandef;
82 case NL80211_IFTYPE_AP: