diff options
author | Johannes Berg <johannes.berg@intel.com> | 2012-06-28 04:33:25 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-28 04:35:50 -0400 |
commit | fc8a7321d3d68af759a369a9ad3e2426688742d3 (patch) | |
tree | caac90c4c1010b374a9df08eefd0c3a38329d7fa /net/mac80211/cfg.c | |
parent | dfb89c56add259b72a9c68d6b2846c1cd8c4e4b6 (diff) |
mac80211: don't expose ieee80211_add_srates_ie()
This and ieee80211_add_ext_srates_ie() aren't
exported, so can't be used by drivers anyway,
but there's also no reason that they should be
so make them private to mac80211 and use sdata
instead of vif arguments.
Acked-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/cfg.c')
-rw-r--r-- | net/mac80211/cfg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 7722a7336a58..ebc353ef6902 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -2665,8 +2665,8 @@ ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev, | |||
2665 | tf->u.setup_req.capability = | 2665 | tf->u.setup_req.capability = |
2666 | cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata)); | 2666 | cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata)); |
2667 | 2667 | ||
2668 | ieee80211_add_srates_ie(&sdata->vif, skb, false); | 2668 | ieee80211_add_srates_ie(sdata, skb, false); |
2669 | ieee80211_add_ext_srates_ie(&sdata->vif, skb, false); | 2669 | ieee80211_add_ext_srates_ie(sdata, skb, false); |
2670 | ieee80211_tdls_add_ext_capab(skb); | 2670 | ieee80211_tdls_add_ext_capab(skb); |
2671 | break; | 2671 | break; |
2672 | case WLAN_TDLS_SETUP_RESPONSE: | 2672 | case WLAN_TDLS_SETUP_RESPONSE: |
@@ -2679,8 +2679,8 @@ ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev, | |||
2679 | tf->u.setup_resp.capability = | 2679 | tf->u.setup_resp.capability = |
2680 | cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata)); | 2680 | cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata)); |
2681 | 2681 | ||
2682 | ieee80211_add_srates_ie(&sdata->vif, skb, false); | 2682 | ieee80211_add_srates_ie(sdata, skb, false); |
2683 | ieee80211_add_ext_srates_ie(&sdata->vif, skb, false); | 2683 | ieee80211_add_ext_srates_ie(sdata, skb, false); |
2684 | ieee80211_tdls_add_ext_capab(skb); | 2684 | ieee80211_tdls_add_ext_capab(skb); |
2685 | break; | 2685 | break; |
2686 | case WLAN_TDLS_SETUP_CONFIRM: | 2686 | case WLAN_TDLS_SETUP_CONFIRM: |
@@ -2740,8 +2740,8 @@ ieee80211_prep_tdls_direct(struct wiphy *wiphy, struct net_device *dev, | |||
2740 | mgmt->u.action.u.tdls_discover_resp.capability = | 2740 | mgmt->u.action.u.tdls_discover_resp.capability = |
2741 | cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata)); | 2741 | cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata)); |
2742 | 2742 | ||
2743 | ieee80211_add_srates_ie(&sdata->vif, skb, false); | 2743 | ieee80211_add_srates_ie(sdata, skb, false); |
2744 | ieee80211_add_ext_srates_ie(&sdata->vif, skb, false); | 2744 | ieee80211_add_ext_srates_ie(sdata, skb, false); |
2745 | ieee80211_tdls_add_ext_capab(skb); | 2745 | ieee80211_tdls_add_ext_capab(skb); |
2746 | break; | 2746 | break; |
2747 | default: | 2747 | default: |