xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Browse Source 
Conflicts:
	drivers/net/wireless/brcm80211/Kconfig
	net/mac80211/util.c
This commit is contained in:
John W. Linville
2013-12-06 09:50:45 -05:00
parent 251c9ba191 a59b40b30f
commit e08fd975bf
34 changed files with 233 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/mac80211/iface.c
View File

@@ -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;