diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-06 09:50:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-06 09:50:45 -0500 |
| commit | e08fd975bf26aa8063cadd245817e042f570472d (patch) | |
| tree | 2b2a705710e6374cc037f89bcc7bfc25047485ba /net/mac80211/iface.c | |
| parent | 251c9ba19143caa5eb5b6ec52c77c70c9d7b3d8f (diff) | |
| parent | a59b40b30f3f51bf5c56c15a7dc4da11b424a34b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/Kconfig
net/mac80211/util.c
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 d226751ba63a..7aa9f9dea9df 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1327,7 +1327,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; |