Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

1 files changed, 22 insertions, 16 deletions

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 391445c6b892..841b8450b3de 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -417,9 +417,6 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
 
         memset(&params, 0, sizeof(params));
 
-        if (!local->ops->conf_tx)
-                return;
-
         local->wmm_acm = 0;
         for (; left >= 4; left -= 4, pos += 4) {
                 int aci = (pos[0] >> 5) & 0x03;
@@ -427,26 +424,26 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
                 int queue;
 
                 switch (aci) {
-                case 1:
+                case 1: /* AC_BK */
                         queue = 3;
                         if (acm)
-                                local->wmm_acm |= BIT(0) | BIT(3);
+                                local->wmm_acm |= BIT(1) | BIT(2); /* BK/- */
                         break;
-                case 2:
+                case 2: /* AC_VI */
                         queue = 1;
                         if (acm)
-                                local->wmm_acm |= BIT(4) | BIT(5);
+                                local->wmm_acm |= BIT(4) | BIT(5); /* CL/VI */
                         break;
-                case 3:
+                case 3: /* AC_VO */
                         queue = 0;
                         if (acm)
-                                local->wmm_acm |= BIT(6) | BIT(7);
+                                local->wmm_acm |= BIT(6) | BIT(7); /* VO/NC */
                         break;
-                case 0:
+                case 0: /* AC_BE */
                 default:
                         queue = 2;
                         if (acm)
-                                local->wmm_acm |= BIT(1) | BIT(2);
+                                local->wmm_acm |= BIT(0) | BIT(3); /* BE/EE */
                         break;
                 }
 
@@ -460,9 +457,8 @@ static void ieee80211_sta_wmm_params(struct ieee80211_local *local,
                        local->mdev->name, queue, aci, acm, params.aifs, params.cw_min,
                        params.cw_max, params.txop);
 #endif
-                /* TODO: handle ACM (block TX, fallback to next lowest allowed
-                 * AC for now) */
-                if (local->ops->conf_tx(local_to_hw(local), queue, &params)) {
+                if (local->ops->conf_tx &&
+                    local->ops->conf_tx(local_to_hw(local), queue, &params)) {
                         printk(KERN_DEBUG "%s: failed to set TX queue "
                                "parameters for queue %d\n", local->mdev->name, queue);
                 }
@@ -1724,7 +1720,10 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata)
                                 local->int_scan_req.ssids[0].ssid_len = 0;
                         else
                                 local->int_scan_req.ssids[0].ssid_len = ifmgd->ssid_len;
-                        ieee80211_start_scan(sdata, &local->int_scan_req);
+
+                        if (ieee80211_start_scan(sdata, &local->int_scan_req))
+                                ieee80211_scan_failed(local);
+
                         ifmgd->state = IEEE80211_STA_MLME_AUTHENTICATE;
                         set_bit(IEEE80211_STA_REQ_AUTH, &ifmgd->request);
                 } else {
@@ -1761,7 +1760,14 @@ static void ieee80211_sta_work(struct work_struct *work)
             ifmgd->state != IEEE80211_STA_MLME_AUTHENTICATE &&
             ifmgd->state != IEEE80211_STA_MLME_ASSOCIATE &&
             test_and_clear_bit(IEEE80211_STA_REQ_SCAN, &ifmgd->request)) {
-                ieee80211_start_scan(sdata, local->scan_req);
+                /*
+                 * The call to ieee80211_start_scan can fail but ieee80211_request_scan
+                 * (which queued ieee80211_sta_work) did not return an error. Thus, call
+                 * ieee80211_scan_failed here if ieee80211_start_scan fails in order to
+                 * notify the scan requester.
+                 */
+                if (ieee80211_start_scan(sdata, local->scan_req))
+                        ieee80211_scan_failed(local);
                 return;
         }