1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index c3c579f98ed0..617d95340160 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -6526,10 +6526,14 @@ struct sw_pg {
         DECLARE_PCI_UNMAP_ADDR(mapping)
 };
 
+struct sw_tx_bd {
+        struct sk_buff          *skb;
+};
+
 #define SW_RXBD_RING_SIZE (sizeof(struct sw_bd) * RX_DESC_CNT)
 #define SW_RXPG_RING_SIZE (sizeof(struct sw_pg) * RX_DESC_CNT)
 #define RXBD_RING_SIZE (sizeof(struct rx_bd) * RX_DESC_CNT)
-#define SW_TXBD_RING_SIZE (sizeof(struct sw_bd) * TX_DESC_CNT)
+#define SW_TXBD_RING_SIZE (sizeof(struct sw_tx_bd) * TX_DESC_CNT)
 #define TXBD_RING_SIZE (sizeof(struct tx_bd) * TX_DESC_CNT)
 
 /* Buffered flash (Atmel: AT45DB011B) specific information */
@@ -6597,7 +6601,7 @@ struct flash_spec {
 
 struct bnx2_irq {
         irq_handler_t   handler;
-        u16             vector;
+        unsigned int    vector;
         u8              requested;
         char            name[16];
 };
@@ -6609,7 +6613,7 @@ struct bnx2_tx_ring_info {
         u32                     tx_bseq_addr;
 
         struct tx_bd            *tx_desc_ring;
-        struct sw_bd            *tx_buf_ring;
+        struct sw_tx_bd         *tx_buf_ring;
 
         u16                     tx_cons;
         u16                     hw_tx_cons;
@@ -6654,6 +6658,8 @@ struct bnx2_napi {
         struct bnx2_tx_ring_info        tx_ring;
 };
 
+#define BNX2_TIMER_INTERVAL                     HZ
+
 struct bnx2 {
         /* Fields used in the tx and intr/napi performance paths are grouped */
         /* together in the beginning of the structure. */
@@ -6701,9 +6707,6 @@ struct bnx2 {
 
         /* End of fields used in the performance code paths. */
 
-        char                    *name;
-
-        int                     timer_interval;
         int                     current_interval;
         struct                  timer_list timer;
         struct work_struct      reset_task;