Merge branch 'iommu/largepages' into amd-iommu/2.6.35

[karo-tx-linux.git] / drivers / net / wireless / wl12xx / wl1271_tx.h

diff --git a/drivers/net/wireless/wl12xx/wl1271_tx.h b/drivers/net/wireless/wl12xx/wl1271_tx.h
index 416396caf0a0ced1c90fd7505b47bcf092314e0b..17e405a09caaed632ea308f18c6703ff82e4538f 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl1271_tx.h
+++ b/drivers/net/wireless/wl12xx/wl1271_tx.h
@@ -123,6 +123,42 @@ struct wl1271_tx_hw_res_if {
        struct wl1271_tx_hw_res_descr tx_results_queue[TX_HW_RESULT_QUEUE_LEN];
 } __attribute__ ((packed));
 
+static inline int wl1271_tx_get_queue(int queue)
+{
+       /* FIXME: use best effort until WMM is enabled */
+       return CONF_TX_AC_BE;
+
+       switch (queue) {
+       case 0:
+               return CONF_TX_AC_VO;
+       case 1:
+               return CONF_TX_AC_VI;
+       case 2:
+               return CONF_TX_AC_BE;
+       case 3:
+               return CONF_TX_AC_BK;
+       default:
+               return CONF_TX_AC_BE;
+       }
+}
+
+/* wl1271 tx descriptor needs the tid and we need to convert it from ac */
+static inline int wl1271_tx_ac_to_tid(int ac)
+{
+       switch (ac) {
+       case 0:
+               return 0;
+       case 1:
+               return 2;
+       case 2:
+               return 4;
+       case 3:
+               return 6;
+       default:
+               return 0;
+       }
+}
+
 void wl1271_tx_work(struct work_struct *work);
 void wl1271_tx_complete(struct wl1271 *wl, u32 count);
 void wl1271_tx_flush(struct wl1271 *wl);