← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to drivers/net/wireless/mwifiex/wmm.c

  • Committer: Package Import Robot
  • Author(s): maximilian attems, maximilian attems, Ben Hutchings
  • Date: 2012-06-06 10:25:57 UTC
  • mfrom: (1.2.38)
  • Revision ID: package-import@ubuntu.com-20120606102557-b9j3506wcwrqrnx8
Tags: 3.4.1-1~experimental.1
* New upstream release: http://kernelnewbies.org/Linux_3.4
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.1

[ maximilian attems ]
* Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
  IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
  NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
  NET_TEAM, ATH6KL.

[ Ben Hutchings ]
* DFSG: Remove the new vs6624 driver, which contains non-free firmware
* aufs: Update to aufs3.4-20120521
* [rt] Update to 3.4-rt8 and reenable

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/net/wireless/mwifiex/wmm.c
87
87
        const char *ac_str[] = { "BK", "BE", "VI", "VO" };
88
88
 
89
89
        pr_debug("info: WMM AC_%s: ACI=%d, ACM=%d, Aifsn=%d, "
90
 
               "EcwMin=%d, EcwMax=%d, TxopLimit=%d\n",
91
 
               ac_str[wmm_aci_to_qidx_map[(ac_param->aci_aifsn_bitmap
92
 
               & MWIFIEX_ACI) >> 5]],
93
 
               (ac_param->aci_aifsn_bitmap & MWIFIEX_ACI) >> 5,
94
 
               (ac_param->aci_aifsn_bitmap & MWIFIEX_ACM) >> 4,
95
 
               ac_param->aci_aifsn_bitmap & MWIFIEX_AIFSN,
96
 
               ac_param->ecw_bitmap & MWIFIEX_ECW_MIN,
97
 
               (ac_param->ecw_bitmap & MWIFIEX_ECW_MAX) >> 4,
98
 
               le16_to_cpu(ac_param->tx_op_limit));
 
90
                 "EcwMin=%d, EcwMax=%d, TxopLimit=%d\n",
 
91
                 ac_str[wmm_aci_to_qidx_map[(ac_param->aci_aifsn_bitmap
 
92
                                             & MWIFIEX_ACI) >> 5]],
 
93
                 (ac_param->aci_aifsn_bitmap & MWIFIEX_ACI) >> 5,
 
94
                 (ac_param->aci_aifsn_bitmap & MWIFIEX_ACM) >> 4,
 
95
                 ac_param->aci_aifsn_bitmap & MWIFIEX_AIFSN,
 
96
                 ac_param->ecw_bitmap & MWIFIEX_ECW_MIN,
 
97
                 (ac_param->ecw_bitmap & MWIFIEX_ECW_MAX) >> 4,
 
98
                 le16_to_cpu(ac_param->tx_op_limit));
99
99
}
100
100
 
101
101
/*
112
112
 
113
113
        if (!ra_list) {
114
114
                dev_err(adapter->dev, "%s: failed to alloc ra_list\n",
115
 
                                                __func__);
 
115
                        __func__);
116
116
                return NULL;
117
117
        }
118
118
        INIT_LIST_HEAD(&ra_list->list);
154
154
                        ra_list, ra_list->is_11n_enabled);
155
155
 
156
156
                list_add_tail(&ra_list->list,
157
 
                                &priv->wmm.tid_tbl_ptr[i].ra_list);
 
157
                              &priv->wmm.tid_tbl_ptr[i].ra_list);
158
158
 
159
159
                if (!priv->wmm.tid_tbl_ptr[i].ra_list_curr)
160
160
                        priv->wmm.tid_tbl_ptr[i].ra_list_curr = ra_list;
217
217
                wmm_ie->reserved);
218
218
 
219
219
        for (num_ac = 0; num_ac < ARRAY_SIZE(wmm_ie->ac_params); num_ac++) {
220
 
                cw_min = (1 << (wmm_ie->ac_params[num_ac].ecw_bitmap &
221
 
                        MWIFIEX_ECW_MIN)) - 1;
222
 
                avg_back_off = (cw_min >> 1) +
223
 
                        (wmm_ie->ac_params[num_ac].aci_aifsn_bitmap &
224
 
                        MWIFIEX_AIFSN);
 
220
                u8 ecw = wmm_ie->ac_params[num_ac].ecw_bitmap;
 
221
                u8 aci_aifsn = wmm_ie->ac_params[num_ac].aci_aifsn_bitmap;
 
222
                cw_min = (1 << (ecw & MWIFIEX_ECW_MIN)) - 1;
 
223
                avg_back_off = (cw_min >> 1) + (aci_aifsn & MWIFIEX_AIFSN);
225
224
 
226
 
                ac_idx = wmm_aci_to_qidx_map[(wmm_ie->ac_params[num_ac].
227
 
                                             aci_aifsn_bitmap &
228
 
                                             MWIFIEX_ACI) >> 5];
 
225
                ac_idx = wmm_aci_to_qidx_map[(aci_aifsn & MWIFIEX_ACI) >> 5];
229
226
                priv->wmm.queue_priority[ac_idx] = ac_idx;
230
227
                tmp[ac_idx] = avg_back_off;
231
228
 
232
 
                dev_dbg(priv->adapter->dev, "info: WMM: CWmax=%d CWmin=%d Avg Back-off=%d\n",
233
 
                       (1 << ((wmm_ie->ac_params[num_ac].ecw_bitmap &
234
 
                       MWIFIEX_ECW_MAX) >> 4)) - 1,
235
 
                       cw_min, avg_back_off);
 
229
                dev_dbg(priv->adapter->dev,
 
230
                        "info: WMM: CWmax=%d CWmin=%d Avg Back-off=%d\n",
 
231
                        (1 << ((ecw & MWIFIEX_ECW_MAX) >> 4)) - 1,
 
232
                        cw_min, avg_back_off);
236
233
                mwifiex_wmm_ac_debug_print(&wmm_ie->ac_params[num_ac]);
237
234
        }
238
235
 
312
309
                /* WMM is not enabled, default priorities */
313
310
                for (ac_val = WMM_AC_BK; ac_val <= WMM_AC_VO; ac_val++)
314
311
                        priv->wmm.ac_down_graded_vals[ac_val] =
315
 
                                (enum mwifiex_wmm_ac_e) ac_val;
 
312
                                                (enum mwifiex_wmm_ac_e) ac_val;
316
313
        } else {
317
314
                for (ac_val = WMM_AC_BK; ac_val <= WMM_AC_VO; ac_val++) {
318
315
                        priv->wmm.ac_down_graded_vals[ac_val]
319
316
                                = mwifiex_wmm_eval_downgrade_ac(priv,
320
317
                                                (enum mwifiex_wmm_ac_e) ac_val);
321
 
                        dev_dbg(priv->adapter->dev, "info: WMM: AC PRIO %d maps to %d\n",
 
318
                        dev_dbg(priv->adapter->dev,
 
319
                                "info: WMM: AC PRIO %d maps to %d\n",
322
320
                                ac_val, priv->wmm.ac_down_graded_vals[ac_val]);
323
321
                }
324
322
        }
394
392
                }
395
393
 
396
394
                priv->aggr_prio_tbl[6].amsdu
397
 
                        = priv->aggr_prio_tbl[6].ampdu_ap
398
 
                        = priv->aggr_prio_tbl[6].ampdu_user
399
 
                        = BA_STREAM_NOT_ALLOWED;
 
395
                                        = priv->aggr_prio_tbl[6].ampdu_ap
 
396
                                        = priv->aggr_prio_tbl[6].ampdu_user
 
397
                                        = BA_STREAM_NOT_ALLOWED;
400
398
 
401
399
                priv->aggr_prio_tbl[7].amsdu = priv->aggr_prio_tbl[7].ampdu_ap
402
 
                        = priv->aggr_prio_tbl[7].ampdu_user
403
 
                        = BA_STREAM_NOT_ALLOWED;
 
400
                                        = priv->aggr_prio_tbl[7].ampdu_user
 
401
                                        = BA_STREAM_NOT_ALLOWED;
404
402
 
405
403
                priv->add_ba_param.timeout = MWIFIEX_DEFAULT_BLOCK_ACK_TIMEOUT;
406
404
                priv->add_ba_param.tx_win_size = MWIFIEX_AMPDU_DEF_TXWINSIZE;
472
470
 
473
471
        for (i = 0; i < MAX_NUM_TID; i++)
474
472
                mwifiex_wmm_del_pkts_in_ralist(priv, &priv->wmm.tid_tbl_ptr[i].
475
 
                                                     ra_list);
 
473
                                                                       ra_list);
476
474
 
477
475
        atomic_set(&priv->wmm.tx_pkts_queued, 0);
478
476
        atomic_set(&priv->wmm.highest_queued_prio, HIGH_PRIO_TID);
488
486
 
489
487
        for (i = 0; i < MAX_NUM_TID; ++i) {
490
488
                dev_dbg(priv->adapter->dev,
491
 
                                "info: ra_list: freeing buf for tid %d\n", i);
 
489
                        "info: ra_list: freeing buf for tid %d\n", i);
492
490
                list_for_each_entry_safe(ra_list, tmp_node,
493
 
                                &priv->wmm.tid_tbl_ptr[i].ra_list, list) {
 
491
                                         &priv->wmm.tid_tbl_ptr[i].ra_list,
 
492
                                         list) {
494
493
                        list_del(&ra_list->list);
495
494
                        kfree(ra_list);
496
495
                }
599
598
 * is queued at the list tail.
600
599
 */
601
600
void
602
 
mwifiex_wmm_add_buf_txqueue(struct mwifiex_adapter *adapter,
 
601
mwifiex_wmm_add_buf_txqueue(struct mwifiex_private *priv,
603
602
                            struct sk_buff *skb)
604
603
{
605
 
        struct mwifiex_txinfo *tx_info = MWIFIEX_SKB_TXCB(skb);
606
 
        struct mwifiex_private *priv = adapter->priv[tx_info->bss_index];
 
604
        struct mwifiex_adapter *adapter = priv->adapter;
607
605
        u32 tid;
608
606
        struct mwifiex_ra_list_tbl *ra_list;
609
607
        u8 ra[ETH_ALEN], tid_down;
653
651
        if (atomic_read(&priv->wmm.highest_queued_prio) <
654
652
                                                tos_to_tid_inv[tid_down])
655
653
                atomic_set(&priv->wmm.highest_queued_prio,
656
 
                                                tos_to_tid_inv[tid_down]);
 
654
                           tos_to_tid_inv[tid_down]);
657
655
 
658
656
        spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, flags);
659
657
}
682
680
        struct mwifiex_wmm_ac_status *ac_status;
683
681
 
684
682
        dev_dbg(priv->adapter->dev, "info: WMM: WMM_GET_STATUS cmdresp received: %d\n",
685
 
                        resp_len);
 
683
                resp_len);
686
684
 
687
685
        while ((resp_len >= sizeof(tlv_hdr->header)) && valid) {
688
686
                tlv_hdr = (struct mwifiex_ie_types_data *) curr;
696
694
                        dev_dbg(priv->adapter->dev,
697
695
                                "info: CMD_RESP: WMM_GET_STATUS:"
698
696
                                " QSTATUS TLV: %d, %d, %d\n",
699
 
                               tlv_wmm_qstatus->queue_index,
700
 
                               tlv_wmm_qstatus->flow_required,
701
 
                               tlv_wmm_qstatus->disabled);
 
697
                                tlv_wmm_qstatus->queue_index,
 
698
                                tlv_wmm_qstatus->flow_required,
 
699
                                tlv_wmm_qstatus->disabled);
702
700
 
703
701
                        ac_status = &priv->wmm.ac_status[tlv_wmm_qstatus->
704
702
                                                         queue_index];
705
703
                        ac_status->disabled = tlv_wmm_qstatus->disabled;
706
704
                        ac_status->flow_required =
707
 
                                tlv_wmm_qstatus->flow_required;
 
705
                                                tlv_wmm_qstatus->flow_required;
708
706
                        ac_status->flow_created = tlv_wmm_qstatus->flow_created;
709
707
                        break;
710
708
 
773
771
        if (!wmm_ie)
774
772
                return 0;
775
773
 
776
 
        dev_dbg(priv->adapter->dev, "info: WMM: process assoc req:"
777
 
                        "bss->wmmIe=0x%x\n",
778
 
                        wmm_ie->vend_hdr.element_id);
 
774
        dev_dbg(priv->adapter->dev,
 
775
                "info: WMM: process assoc req: bss->wmm_ie=%#x\n",
 
776
                wmm_ie->vend_hdr.element_id);
779
777
 
780
 
        if ((priv->wmm_required
781
 
             || (ht_cap && (priv->adapter->config_bands & BAND_GN
782
 
                     || priv->adapter->config_bands & BAND_AN))
783
 
            )
784
 
            && wmm_ie->vend_hdr.element_id == WLAN_EID_VENDOR_SPECIFIC) {
 
778
        if ((priv->wmm_required ||
 
779
             (ht_cap && (priv->adapter->config_bands & BAND_GN ||
 
780
             priv->adapter->config_bands & BAND_AN))) &&
 
781
            wmm_ie->vend_hdr.element_id == WLAN_EID_VENDOR_SPECIFIC) {
785
782
                wmm_tlv = (struct mwifiex_ie_types_wmm_param_set *) *assoc_buf;
786
783
                wmm_tlv->header.type = cpu_to_le16((u16) wmm_info_ie[0]);
787
784
                wmm_tlv->header.len = cpu_to_le16((u16) wmm_info_ie[1]);
788
785
                memcpy(wmm_tlv->wmm_ie, &wmm_info_ie[2],
789
 
                        le16_to_cpu(wmm_tlv->header.len));
 
786
                       le16_to_cpu(wmm_tlv->header.len));
790
787
                if (wmm_ie->qos_info_bitmap & IEEE80211_WMM_IE_AP_QOSINFO_UAPSD)
791
788
                        memcpy((u8 *) (wmm_tlv->wmm_ie
792
 
                                        + le16_to_cpu(wmm_tlv->header.len)
793
 
                                         - sizeof(priv->wmm_qosinfo)),
794
 
                                        &priv->wmm_qosinfo,
795
 
                                        sizeof(priv->wmm_qosinfo));
 
789
                                       + le16_to_cpu(wmm_tlv->header.len)
 
790
                                       - sizeof(priv->wmm_qosinfo)),
 
791
                               &priv->wmm_qosinfo, sizeof(priv->wmm_qosinfo));
796
792
 
797
793
                ret_len = sizeof(wmm_tlv->header)
798
 
                        + le16_to_cpu(wmm_tlv->header.len);
 
794
                          + le16_to_cpu(wmm_tlv->header.len);
799
795
 
800
796
                *assoc_buf += ret_len;
801
797
        }
814
810
 */
815
811
u8
816
812
mwifiex_wmm_compute_drv_pkt_delay(struct mwifiex_private *priv,
817
 
                                        const struct sk_buff *skb)
 
813
                                  const struct sk_buff *skb)
818
814
{
819
815
        u8 ret_val;
820
816
        struct timeval out_tstamp, in_tstamp;
851
847
        struct mwifiex_ra_list_tbl *ptr, *head;
852
848
        struct mwifiex_bss_prio_node *bssprio_node, *bssprio_head;
853
849
        struct mwifiex_tid_tbl *tid_ptr;
 
850
        atomic_t *hqp;
854
851
        int is_list_empty;
855
852
        unsigned long flags;
856
853
        int i, j;
857
854
 
858
855
        for (j = adapter->priv_num - 1; j >= 0; --j) {
859
856
                spin_lock_irqsave(&adapter->bss_prio_tbl[j].bss_prio_lock,
860
 
                                flags);
 
857
                                  flags);
861
858
                is_list_empty = list_empty(&adapter->bss_prio_tbl[j]
862
 
                                .bss_prio_head);
 
859
                                           .bss_prio_head);
863
860
                spin_unlock_irqrestore(&adapter->bss_prio_tbl[j].bss_prio_lock,
864
 
                                flags);
 
861
                                       flags);
865
862
                if (is_list_empty)
866
863
                        continue;
867
864
 
880
877
                }
881
878
 
882
879
                do {
883
 
                        atomic_t *hqp;
884
 
                        spinlock_t *lock;
885
 
 
886
880
                        priv_tmp = bssprio_node->priv;
887
881
                        hqp = &priv_tmp->wmm.highest_queued_prio;
888
 
                        lock = &priv_tmp->wmm.ra_list_spinlock;
889
882
 
890
883
                        for (i = atomic_read(hqp); i >= LOW_PRIO_TID; --i) {
891
884
 
924
917
                                do {
925
918
                                        is_list_empty =
926
919
                                                skb_queue_empty(&ptr->skb_head);
927
 
                                        if (!is_list_empty) {
928
 
                                                spin_lock_irqsave(lock, flags);
929
 
                                                if (atomic_read(hqp) > i)
930
 
                                                        atomic_set(hqp, i);
931
 
                                                spin_unlock_irqrestore(lock,
932
 
                                                                        flags);
933
 
                                                *priv = priv_tmp;
934
 
                                                *tid = tos_to_tid[i];
935
 
                                                return ptr;
936
 
                                        }
 
920
 
 
921
                                        if (!is_list_empty)
 
922
                                                goto found;
 
923
 
937
924
                                        /* Get next ra */
938
925
                                        ptr = list_first_entry(&ptr->list,
939
926
                                                 struct mwifiex_ra_list_tbl,
970
957
                } while (bssprio_node != bssprio_head);
971
958
        }
972
959
        return NULL;
 
960
 
 
961
found:
 
962
        spin_lock_irqsave(&priv_tmp->wmm.ra_list_spinlock, flags);
 
963
        if (atomic_read(hqp) > i)
 
964
                atomic_set(hqp, i);
 
965
        spin_unlock_irqrestore(&priv_tmp->wmm.ra_list_spinlock, flags);
 
966
 
 
967
        *priv = priv_tmp;
 
968
        *tid = tos_to_tid[i];
 
969
 
 
970
        return ptr;
973
971
}
974
972
 
975
973
/*
1209
1207
                return 0;
1210
1208
        }
1211
1209
 
1212
 
        if (!ptr->is_11n_enabled || mwifiex_is_ba_stream_setup(priv, ptr, tid)
1213
 
            || ((priv->sec_info.wpa_enabled
1214
 
                  || priv->sec_info.wpa2_enabled) && !priv->wpa_is_gtk_set)
1215
 
                ) {
 
1210
        if (!ptr->is_11n_enabled ||
 
1211
            mwifiex_is_ba_stream_setup(priv, ptr, tid) ||
 
1212
            ((priv->sec_info.wpa_enabled ||
 
1213
              priv->sec_info.wpa2_enabled) &&
 
1214
             !priv->wpa_is_gtk_set)) {
1216
1215
                mwifiex_send_single_packet(priv, ptr, ptr_index, flags);
1217
1216
                /* ra_list_spinlock has been freed in
1218
1217
                   mwifiex_send_single_packet() */
1219
1218
        } else {
1220
1219
                if (mwifiex_is_ampdu_allowed(priv, tid)) {
1221
1220
                        if (mwifiex_space_avail_for_new_ba_stream(adapter)) {
1222
 
                                mwifiex_11n_create_tx_ba_stream_tbl(priv,
1223
 
                                                ptr->ra, tid,
1224
 
                                                BA_STREAM_SETUP_INPROGRESS);
 
1221
                                mwifiex_create_ba_tbl(priv, ptr->ra, tid,
 
1222
                                                      BA_SETUP_INPROGRESS);
1225
1223
                                mwifiex_send_addba(priv, tid, ptr->ra);
1226
1224
                        } else if (mwifiex_find_stream_to_delete
1227
1225
                                   (priv, tid, &tid_del, ra)) {
1228
 
                                mwifiex_11n_create_tx_ba_stream_tbl(priv,
1229
 
                                                ptr->ra, tid,
1230
 
                                                BA_STREAM_SETUP_INPROGRESS);
 
1226
                                mwifiex_create_ba_tbl(priv, ptr->ra, tid,
 
1227
                                                      BA_SETUP_INPROGRESS);
1231
1228
                                mwifiex_send_delba(priv, tid_del, ra, 1);
1232
1229
                        }
1233
1230
                }