evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mac80211: Add WME information element for IBSS

Browse source 
Enable WME QoS in IBSS mode by adding a WME information element to beacons and
probe respones and by checking for it and marking stations as WME capable if it
is present.

Signed-off-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Bruno Randolf 2010-10-04 11:17:30 +09:00 • committed by John W. Linville
parent b34793ee27
commit 9eba612549
1 changed files with 43 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
net/mac80211/ibss.c
View file

@ -173,6 +173,19 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
memcpy(skb_put(skb, ifibss->ie_len), memcpy(skb_put(skb, ifibss->ie_len),
ifibss->ie, ifibss->ie_len); ifibss->ie, ifibss->ie_len);
if (local->hw.queues >= 4) {
pos = skb_put(skb, 9);
*pos++ = WLAN_EID_VENDOR_SPECIFIC;
*pos++ = 7; /* len */
*pos++ = 0x00; /* Microsoft OUI 00:50:F2 */
*pos++ = 0x50;
*pos++ = 0xf2;
*pos++ = 2; /* WME */
*pos++ = 0; /* WME info */
*pos++ = 1; /* WME ver */
*pos++ = 0; /* U-APSD no in use */
}
rcu_assign_pointer(ifibss->presp, skb); rcu_assign_pointer(ifibss->presp, skb);
sdata->vif.bss_conf.beacon_int = beacon_int; sdata->vif.bss_conf.beacon_int = beacon_int;
@ -266,13 +279,15 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
if (!channel || channel->flags & IEEE80211_CHAN_DISABLED) if (!channel || channel->flags & IEEE80211_CHAN_DISABLED)
return; return;
if (sdata->vif.type == NL80211_IFTYPE_ADHOC && elems->supp_rates && if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
memcmp(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) { memcmp(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) {
supp_rates = ieee80211_sta_get_rates(local, elems, band);
rcu_read_lock(); rcu_read_lock();
sta = sta_info_get(sdata, mgmt->sa); sta = sta_info_get(sdata, mgmt->sa);
if (elems->supp_rates) {
supp_rates = ieee80211_sta_get_rates(local, elems,
band);
if (sta) { if (sta) {
u32 prev_rates; u32 prev_rates;
@ -283,20 +298,26 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
if (sta->sta.supp_rates[band] != prev_rates) { if (sta->sta.supp_rates[band] != prev_rates) {
#ifdef CONFIG_MAC80211_IBSS_DEBUG #ifdef CONFIG_MAC80211_IBSS_DEBUG
printk(KERN_DEBUG "%s: updated supp_rates set " printk(KERN_DEBUG
"for %pM based on beacon/probe_response " "%s: updated supp_rates set "
"(0x%x -> 0x%x)\n", "for %pM based on beacon"
"/probe_resp (0x%x -> 0x%x)\n",
sdata->name, sta->sta.addr, sdata->name, sta->sta.addr,
prev_rates, sta->sta.supp_rates[band]); prev_rates,
sta->sta.supp_rates[band]);
#endif #endif
rate_control_rate_init(sta); rate_control_rate_init(sta);
} }
rcu_read_unlock(); } else
} else { sta = ieee80211_ibss_add_sta(sdata, mgmt->bssid,
rcu_read_unlock(); mgmt->sa, supp_rates,
ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, GFP_ATOMIC);
supp_rates, GFP_KERNEL);
} }
if (sta && elems->wmm_info)
set_sta_flags(sta, WLAN_STA_WME);
rcu_read_unlock();
} }
bss = ieee80211_bss_info_update(local, rx_status, mgmt, len, elems, bss = ieee80211_bss_info_update(local, rx_status, mgmt, len, elems,