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

Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem

Browse Source
This commit is contained in:
John W. Linville
2011-09-19 15:00:16 -04:00
parent 765cf9976e 12e62d6f7e
commit b53d63ecce
137 changed files with 9895 additions and 4629 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
net/mac80211/cfg.c
View File

@@ -455,6 +455,20 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,
return ret;
}
static void ieee80211_config_ap_ssid(struct ieee80211_sub_if_data *sdata,
struct beacon_parameters *params)
{
struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf;
bss_conf->ssid_len = params->ssid_len;
if (params->ssid_len)
memcpy(bss_conf->ssid, params->ssid, params->ssid_len);
bss_conf->hidden_ssid =
(params->hidden_ssid != NL80211_HIDDEN_SSID_NOT_IN_USE);
}
/*
* This handles both adding a beacon and setting new beacon info
*/
@@ -548,8 +562,11 @@ static int ieee80211_config_beacon(struct ieee80211_sub_if_data *sdata,
kfree(old);
ieee80211_config_ap_ssid(sdata, params);
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED |
BSS_CHANGED_BEACON);
BSS_CHANGED_BEACON |
BSS_CHANGED_SSID);
return 0;
}
@@ -921,7 +938,7 @@ static int ieee80211_del_mpath(struct wiphy *wiphy, struct net_device *dev,
if (dst)
return mesh_path_del(dst, sdata);
mesh_path_flush(sdata);
mesh_path_flush_by_iface(sdata);
return 0;
}