1 files changed, 29 insertions, 4 deletions

diff --git a/drivers/net/wireless/mwifiex/pcie.h b/drivers/net/wireless/mwifiex/pcie.h
index 2f218f9a3fd3..37eeb2ca6b29 100644
--- a/drivers/net/wireless/mwifiex/pcie.h
+++ b/drivers/net/wireless/mwifiex/pcie.h
@@ -114,11 +114,12 @@ struct pcie_service_card {
         struct pci_dev *dev;
         struct mwifiex_adapter *adapter;
 
+        u8 txbd_flush;
         u32 txbd_wrptr;
         u32 txbd_rdptr;
         u32 txbd_ring_size;
         u8 *txbd_ring_vbase;
-        phys_addr_t txbd_ring_pbase;
+        dma_addr_t txbd_ring_pbase;
         struct mwifiex_pcie_buf_desc *txbd_ring[MWIFIEX_MAX_TXRX_BD];
         struct sk_buff *tx_buf_list[MWIFIEX_MAX_TXRX_BD];
 
@@ -126,7 +127,7 @@ struct pcie_service_card {
         u32 rxbd_rdptr;
         u32 rxbd_ring_size;
         u8 *rxbd_ring_vbase;
-        phys_addr_t rxbd_ring_pbase;
+        dma_addr_t rxbd_ring_pbase;
         struct mwifiex_pcie_buf_desc *rxbd_ring[MWIFIEX_MAX_TXRX_BD];
         struct sk_buff *rx_buf_list[MWIFIEX_MAX_TXRX_BD];
 
@@ -134,15 +135,39 @@ struct pcie_service_card {
         u32 evtbd_rdptr;
         u32 evtbd_ring_size;
         u8 *evtbd_ring_vbase;
-        phys_addr_t evtbd_ring_pbase;
+        dma_addr_t evtbd_ring_pbase;
         struct mwifiex_pcie_buf_desc *evtbd_ring[MWIFIEX_MAX_EVT_BD];
         struct sk_buff *evt_buf_list[MWIFIEX_MAX_EVT_BD];
 
         struct sk_buff *cmd_buf;
         struct sk_buff *cmdrsp_buf;
-        struct sk_buff *sleep_cookie;
+        u8 *sleep_cookie_vbase;
+        dma_addr_t sleep_cookie_pbase;
         void __iomem *pci_mmap;
         void __iomem *pci_mmap1;
 };
 
+static inline int
+mwifiex_pcie_txbd_empty(struct pcie_service_card *card, u32 rdptr)
+{
+        if (((card->txbd_wrptr & MWIFIEX_TXBD_MASK) ==
+                        (rdptr & MWIFIEX_TXBD_MASK)) &&
+            ((card->txbd_wrptr & MWIFIEX_BD_FLAG_ROLLOVER_IND) !=
+                        (rdptr & MWIFIEX_BD_FLAG_ROLLOVER_IND)))
+                return 1;
+
+        return 0;
+}
+
+static inline int
+mwifiex_pcie_txbd_not_full(struct pcie_service_card *card)
+{
+        if (((card->txbd_wrptr & MWIFIEX_TXBD_MASK) !=
+             (card->txbd_rdptr & MWIFIEX_TXBD_MASK)) ||
+            ((card->txbd_wrptr & MWIFIEX_BD_FLAG_ROLLOVER_IND) !=
+             (card->txbd_rdptr & MWIFIEX_BD_FLAG_ROLLOVER_IND)))
+                return 1;
+
+        return 0;
+}
 #endif /* _MWIFIEX_PCIE_H */