diff options
author | Arik Nemtsov <arik@wizery.com> | 2011-09-28 07:12:51 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-30 15:57:06 -0400 |
commit | 768db3438b4b48a33d073093bb364e624409cab7 (patch) | |
tree | 72e2d33d14484d46c16a2880df9c5d633ce7683c /net/mac80211/tx.c | |
parent | 109086ce0b0f94760bdb0e8e2566ff8a2d673639 (diff) |
mac80211: standardize adding supported rates IEs
Relocate the mesh implementation of adding the (extended) supported
rates IE to util.c, anticipating its use by other parts of mac80211.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Cc: Kalyan C Gaddam <chakkal@iit.edu>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r-- | net/mac80211/tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 7cd6c28968b2..542272acfc1a 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c | |||
@@ -2307,9 +2307,9 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, | |||
2307 | *pos++ = WLAN_EID_SSID; | 2307 | *pos++ = WLAN_EID_SSID; |
2308 | *pos++ = 0x0; | 2308 | *pos++ = 0x0; |
2309 | 2309 | ||
2310 | if (mesh_add_srates_ie(skb, sdata) || | 2310 | if (ieee80211_add_srates_ie(&sdata->vif, skb) || |
2311 | mesh_add_ds_params_ie(skb, sdata) || | 2311 | mesh_add_ds_params_ie(skb, sdata) || |
2312 | mesh_add_ext_srates_ie(skb, sdata) || | 2312 | ieee80211_add_ext_srates_ie(&sdata->vif, skb) || |
2313 | mesh_add_rsn_ie(skb, sdata) || | 2313 | mesh_add_rsn_ie(skb, sdata) || |
2314 | mesh_add_meshid_ie(skb, sdata) || | 2314 | mesh_add_meshid_ie(skb, sdata) || |
2315 | mesh_add_meshconf_ie(skb, sdata) || | 2315 | mesh_add_meshconf_ie(skb, sdata) || |