ibmvnic: Remove unused TSO resources in TX pool structure

[linux.git] / drivers / net / ethernet / ibm / ibmvnic.h

diff --git a/drivers/net/ethernet/ibm/ibmvnic.h b/drivers/net/ethernet/ibm/ibmvnic.h
index fe21a6e2ddae0967fa5ff802209e8348b825da35..89efe700eafe796667147b58bbe617cc57761722 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.h
+++ b/drivers/net/ethernet/ibm/ibmvnic.h
@@ -43,6 +43,7 @@
 
 #define IBMVNIC_TSO_BUF_SZ     65536
 #define IBMVNIC_TSO_BUFS       64
+#define IBMVNIC_TSO_POOL_MASK  0x80000000
 
 #define IBMVNIC_MAX_LTB_SIZE ((1 << (MAX_ORDER - 1)) * PAGE_SIZE)
 #define IBMVNIC_BUFFER_HLEN 500
@@ -909,6 +910,7 @@ struct ibmvnic_tx_buff {
        union sub_crq indir_arr[6];
        u8 hdr_data[140];
        dma_addr_t indir_dma;
+       int num_entries;
 };
 
 struct ibmvnic_tx_pool {
@@ -916,11 +918,9 @@ struct ibmvnic_tx_pool {
        int *free_map;
        int consumer_index;
        int producer_index;
-       wait_queue_head_t ibmvnic_tx_comp_q;
-       struct task_struct *work_thread;
        struct ibmvnic_long_term_buff long_term_buff;
-       struct ibmvnic_long_term_buff tso_ltb;
-       int tso_index;
+       int num_buffers;
+       int buf_size;
 };
 
 struct ibmvnic_rx_buff {
@@ -1043,6 +1043,7 @@ struct ibmvnic_adapter {
        u64 promisc;
 
        struct ibmvnic_tx_pool *tx_pool;
+       struct ibmvnic_tx_pool *tso_pool;
        struct completion init_done;
        int init_done_rc;
 
@@ -1091,8 +1092,11 @@ struct ibmvnic_adapter {
        u64 opt_rxba_entries_per_subcrq;
        __be64 tx_rx_desc_req;
        u8 map_id;
-       u64 num_active_rx_pools;
-       u64 num_active_tx_pools;
+       u32 num_active_rx_scrqs;
+       u32 num_active_rx_pools;
+       u32 num_active_rx_napi;
+       u32 num_active_tx_scrqs;
+       u32 num_active_tx_pools;
 
        struct tasklet_struct tasklet;
        enum vnic_state state;