diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-09-09 03:32:59 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-09-11 15:53:37 -0400 |
commit | b079ada7dd11cf82c3157a51c205c3d88321c704 (patch) | |
tree | 0a9c4a0b1f1e149d6aba2a4f07a4299723963f21 /net/mac80211/mlme.c | |
parent | a0fe8b3349bdee27065b57cdceb2ca53c1487866 (diff) |
mac80211: remove useless 'ibss' parameter
Ever since we refactored beaconing to not be controlled by a
fake queue this parameter to ieee80211_sta_def_wmm_params
has been unused.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index f4cbe5cc56c5..b1815c1ee6d3 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -188,8 +188,7 @@ void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst, | |||
188 | 188 | ||
189 | /* MLME */ | 189 | /* MLME */ |
190 | static void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata, | 190 | static void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata, |
191 | struct ieee80211_sta_bss *bss, | 191 | struct ieee80211_sta_bss *bss) |
192 | int ibss) | ||
193 | { | 192 | { |
194 | struct ieee80211_local *local = sdata->local; | 193 | struct ieee80211_local *local = sdata->local; |
195 | int i, have_higher_than_11mbit = 0; | 194 | int i, have_higher_than_11mbit = 0; |
@@ -1849,7 +1848,7 @@ static int ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, | |||
1849 | } | 1848 | } |
1850 | ifsta->supp_rates_bits[local->hw.conf.channel->band] = rates; | 1849 | ifsta->supp_rates_bits[local->hw.conf.channel->band] = rates; |
1851 | 1850 | ||
1852 | ieee80211_sta_def_wmm_params(sdata, bss, 1); | 1851 | ieee80211_sta_def_wmm_params(sdata, bss); |
1853 | 1852 | ||
1854 | ifsta->state = IEEE80211_STA_MLME_IBSS_JOINED; | 1853 | ifsta->state = IEEE80211_STA_MLME_IBSS_JOINED; |
1855 | mod_timer(&ifsta->timer, jiffies + IEEE80211_IBSS_MERGE_INTERVAL); | 1854 | mod_timer(&ifsta->timer, jiffies + IEEE80211_IBSS_MERGE_INTERVAL); |
@@ -2932,7 +2931,7 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata, | |||
2932 | ieee80211_sta_set_ssid(sdata, selected->ssid, | 2931 | ieee80211_sta_set_ssid(sdata, selected->ssid, |
2933 | selected->ssid_len); | 2932 | selected->ssid_len); |
2934 | ieee80211_sta_set_bssid(sdata, selected->bssid); | 2933 | ieee80211_sta_set_bssid(sdata, selected->bssid); |
2935 | ieee80211_sta_def_wmm_params(sdata, selected, 0); | 2934 | ieee80211_sta_def_wmm_params(sdata, selected); |
2936 | 2935 | ||
2937 | /* Send out direct probe if no probe resp was received or | 2936 | /* Send out direct probe if no probe resp was received or |
2938 | * the one we have is outdated | 2937 | * the one we have is outdated |