diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2013-12-05 09:29:56 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-05 09:29:56 -0500 |
| commit | aa489f0f268595bd33d9649030bd1a43c28927a0 (patch) | |
| tree | 598cb96d4b22749e07116cb4006d71fb5a5704ea /net/mac80211/iface.c | |
| parent | Merge branch 'cxgb4' (diff) | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (diff) | |
| download | linux-dev-aa489f0f268595bd33d9649030bd1a43c28927a0.tar.xz linux-dev-aa489f0f268595bd33d9649030bd1a43c28927a0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index ff101ea1d9ae..36c3a4cbcabf 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; |