aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mesh_plink.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/mesh_plink.c')
-rw-r--r--net/mac80211/mesh_plink.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 563bea050383..79f2a0a13db8 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -93,18 +93,18 @@ static inline void mesh_plink_fsm_restart(struct sta_info *sta)
93static u32 mesh_set_short_slot_time(struct ieee80211_sub_if_data *sdata) 93static u32 mesh_set_short_slot_time(struct ieee80211_sub_if_data *sdata)
94{ 94{
95 struct ieee80211_local *local = sdata->local; 95 struct ieee80211_local *local = sdata->local;
96 enum ieee80211_band band = ieee80211_get_sdata_band(sdata); 96 enum nl80211_band band = ieee80211_get_sdata_band(sdata);
97 struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band]; 97 struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
98 struct sta_info *sta; 98 struct sta_info *sta;
99 u32 erp_rates = 0, changed = 0; 99 u32 erp_rates = 0, changed = 0;
100 int i; 100 int i;
101 bool short_slot = false; 101 bool short_slot = false;
102 102
103 if (band == IEEE80211_BAND_5GHZ) { 103 if (band == NL80211_BAND_5GHZ) {
104 /* (IEEE 802.11-2012 19.4.5) */ 104 /* (IEEE 802.11-2012 19.4.5) */
105 short_slot = true; 105 short_slot = true;
106 goto out; 106 goto out;
107 } else if (band != IEEE80211_BAND_2GHZ) 107 } else if (band != NL80211_BAND_2GHZ)
108 goto out; 108 goto out;
109 109
110 for (i = 0; i < sband->n_bitrates; i++) 110 for (i = 0; i < sband->n_bitrates; i++)
@@ -247,7 +247,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
247 mgmt->u.action.u.self_prot.action_code = action; 247 mgmt->u.action.u.self_prot.action_code = action;
248 248
249 if (action != WLAN_SP_MESH_PEERING_CLOSE) { 249 if (action != WLAN_SP_MESH_PEERING_CLOSE) {
250 enum ieee80211_band band = ieee80211_get_sdata_band(sdata); 250 enum nl80211_band band = ieee80211_get_sdata_band(sdata);
251 251
252 /* capability info */ 252 /* capability info */
253 pos = skb_put(skb, 2); 253 pos = skb_put(skb, 2);
@@ -385,7 +385,7 @@ static void mesh_sta_info_init(struct ieee80211_sub_if_data *sdata,
385 struct ieee802_11_elems *elems, bool insert) 385 struct ieee802_11_elems *elems, bool insert)
386{ 386{
387 struct ieee80211_local *local = sdata->local; 387 struct ieee80211_local *local = sdata->local;
388 enum ieee80211_band band = ieee80211_get_sdata_band(sdata); 388 enum nl80211_band band = ieee80211_get_sdata_band(sdata);
389 struct ieee80211_supported_band *sband; 389 struct ieee80211_supported_band *sband;
390 u32 rates, basic_rates = 0, changed = 0; 390 u32 rates, basic_rates = 0, changed = 0;
391 enum ieee80211_sta_rx_bandwidth bw = sta->sta.bandwidth; 391 enum ieee80211_sta_rx_bandwidth bw = sta->sta.bandwidth;