summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-02-12 10:43:19 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-02-15 03:41:39 -0500
commit4a3cb702b05868f67c4ee3da3380461c5b90b4ca (patch)
tree557b28bd820e50ad7d3c758c34a60d5df006f6ed /net/mac80211/mlme.c
parent50640f169372b9977487a328dedf13a8debedff7 (diff)
mac80211: constify IE parsing
Make all the parsed IE pointers const, and propagate the change to all the users etc. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 05b229e3b226..7a8cd789e487 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1041,10 +1041,10 @@ static void ieee80211_chswitch_timer(unsigned long data)
1041 ieee80211_queue_work(&sdata->local->hw, &ifmgd->chswitch_work); 1041 ieee80211_queue_work(&sdata->local->hw, &ifmgd->chswitch_work);
1042} 1042}
1043 1043
1044void ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, 1044void
1045 struct ieee80211_channel_sw_ie *sw_elem, 1045ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
1046 struct ieee80211_bss *bss, 1046 const struct ieee80211_channel_sw_ie *sw_elem,
1047 u64 timestamp) 1047 struct ieee80211_bss *bss, u64 timestamp)
1048{ 1048{
1049 struct cfg80211_bss *cbss = 1049 struct cfg80211_bss *cbss =
1050 container_of((void *)bss, struct cfg80211_bss, priv); 1050 container_of((void *)bss, struct cfg80211_bss, priv);
@@ -1479,13 +1479,14 @@ void ieee80211_dfs_cac_timer_work(struct work_struct *work)
1479/* MLME */ 1479/* MLME */
1480static bool ieee80211_sta_wmm_params(struct ieee80211_local *local, 1480static bool ieee80211_sta_wmm_params(struct ieee80211_local *local,
1481 struct ieee80211_sub_if_data *sdata, 1481 struct ieee80211_sub_if_data *sdata,
1482 u8 *wmm_param, size_t wmm_param_len) 1482 const u8 *wmm_param, size_t wmm_param_len)
1483{ 1483{
1484 struct ieee80211_tx_queue_params params; 1484 struct ieee80211_tx_queue_params params;
1485 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; 1485 struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
1486 size_t left; 1486 size_t left;
1487 int count; 1487 int count;
1488 u8 *pos, uapsd_queues = 0; 1488 const u8 *pos;
1489 u8 uapsd_queues = 0;
1489 1490
1490 if (!local->ops->conf_tx) 1491 if (!local->ops->conf_tx)
1491 return false; 1492 return false;
@@ -2670,7 +2671,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
2670 need_ps = sdata->u.mgd.associated && !sdata->u.mgd.dtim_period; 2671 need_ps = sdata->u.mgd.associated && !sdata->u.mgd.dtim_period;
2671 2672
2672 if (elems->tim && !elems->parse_error) { 2673 if (elems->tim && !elems->parse_error) {
2673 struct ieee80211_tim_ie *tim_ie = elems->tim; 2674 const struct ieee80211_tim_ie *tim_ie = elems->tim;
2674 sdata->u.mgd.dtim_period = tim_ie->dtim_period; 2675 sdata->u.mgd.dtim_period = tim_ie->dtim_period;
2675 } 2676 }
2676 } 2677 }