summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-11-08 17:31:37 +0100
committerJohannes Berg <johannes.berg@intel.com>2013-11-25 16:50:08 +0100
commit57fb089f480d199e4275da086d407b978de67214 (patch)
treed25c213756c339865e25aba335eb75525c2d789a /net
parent7fa322c878d70e38675f50e17acdce7fa3f5ac8c (diff)
downloadop-kernel-dev-57fb089f480d199e4275da086d407b978de67214.zip
op-kernel-dev-57fb089f480d199e4275da086d407b978de67214.tar.gz
mac80211: fix crash when using AP VLAN interfaces
Commit "mac80211: implement SMPS for AP" applies to AP_VLAN as well. It assumes that sta->sdata->vif.bss_conf.bssid is present, which did not get set for AP_VLAN. Initialize it to sdata->vif.addr like for other interface types. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/iface.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index ff101ea..36c3a4c 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -1325,7 +1325,6 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata,
sdata->vif.bss_conf.bssid = NULL;
break;
case NL80211_IFTYPE_AP_VLAN:
- break;
case NL80211_IFTYPE_P2P_DEVICE:
sdata->vif.bss_conf.bssid = sdata->vif.addr;
break;
OpenPOWER on IntegriCloud