cxgb3 - sge page management

Streamline sge page management.
Fix dma mappings when buffers are recycled.

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 20 insertions, 18 deletions

diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
index 80c3d8f268a7..ab72563b81ee 100644
--- a/drivers/net/cxgb3/adapter.h
+++ b/drivers/net/cxgb3/adapter.h
@@ -71,27 +71,29 @@ enum {				/* adapter flags */
         QUEUES_BOUND = (1 << 3),
 };
 
+struct fl_pg_chunk {
+        struct page *page;
+        void *va;
+        unsigned int offset;
+};
+
 struct rx_desc;
 struct rx_sw_desc;
 
-struct sge_fl_page {
-        struct skb_frag_struct frag;
-        unsigned char *va;
-};
-
-struct sge_fl {                 /* SGE per free-buffer list state */
-        unsigned int buf_size;  /* size of each Rx buffer */
-        unsigned int credits;   /* # of available Rx buffers */
-        unsigned int size;      /* capacity of free list */
-        unsigned int cidx;      /* consumer index */
-        unsigned int pidx;      /* producer index */
-        unsigned int gen;       /* free list generation */
-        unsigned int cntxt_id;  /* SGE context id for the free list */
-        struct sge_fl_page page;
-        struct rx_desc *desc;   /* address of HW Rx descriptor ring */
-        struct rx_sw_desc *sdesc;       /* address of SW Rx descriptor ring */
-        dma_addr_t phys_addr;   /* physical address of HW ring start */
-        unsigned long empty;    /* # of times queue ran out of buffers */
+struct sge_fl {                     /* SGE per free-buffer list state */
+        unsigned int buf_size;      /* size of each Rx buffer */
+        unsigned int credits;       /* # of available Rx buffers */
+        unsigned int size;          /* capacity of free list */
+        unsigned int cidx;          /* consumer index */
+        unsigned int pidx;          /* producer index */
+        unsigned int gen;           /* free list generation */
+        struct fl_pg_chunk pg_chunk;/* page chunk cache */
+        unsigned int use_pages;     /* whether FL uses pages or sk_buffs */
+        struct rx_desc *desc;       /* address of HW Rx descriptor ring */
+        struct rx_sw_desc *sdesc;   /* address of SW Rx descriptor ring */
+        dma_addr_t   phys_addr;     /* physical address of HW ring start */
+        unsigned int cntxt_id;      /* SGE context id for the free list */
+        unsigned long empty;        /* # of times queue ran out of buffers */
         unsigned long alloc_failed; /* # of times buffer allocation failed */
 };