]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
mac80211: remove useless 'ibss' parameter
authorJohannes Berg <johannes@sipsolutions.net>
Tue, 9 Sep 2008 07:32:59 +0000 (09:32 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 11 Sep 2008 19:53:37 +0000 (15:53 -0400)
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>
net/mac80211/mlme.c

index f4cbe5cc56c578d024c5c5b4102b1ff37cbf4e20..b1815c1ee6d370efd183825455d470352e74097f 100644 (file)
@@ -188,8 +188,7 @@ void ieee80211_send_probe_req(struct ieee80211_sub_if_data *sdata, u8 *dst,
 
 /* MLME */
 static void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,
-                                        struct ieee80211_sta_bss *bss,
-                                        int ibss)
+                                        struct ieee80211_sta_bss *bss)
 {
        struct ieee80211_local *local = sdata->local;
        int i, have_higher_than_11mbit = 0;
@@ -1849,7 +1848,7 @@ static int ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
        }
        ifsta->supp_rates_bits[local->hw.conf.channel->band] = rates;
 
-       ieee80211_sta_def_wmm_params(sdata, bss, 1);
+       ieee80211_sta_def_wmm_params(sdata, bss);
 
        ifsta->state = IEEE80211_STA_MLME_IBSS_JOINED;
        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,
                        ieee80211_sta_set_ssid(sdata, selected->ssid,
                                               selected->ssid_len);
                ieee80211_sta_set_bssid(sdata, selected->bssid);
-               ieee80211_sta_def_wmm_params(sdata, selected, 0);
+               ieee80211_sta_def_wmm_params(sdata, selected);
 
                /* Send out direct probe if no probe resp was received or
                 * the one we have is outdated