]> xenbits.xensource.com Git - people/ssmith/nc2-2.6.27.bak/.git/commitdiff
REL_2.0.31.12965_LX-s2io.tar.gz taken from. Some files moved into
authorSteven Smith <ssmith@weybridge.uk.xensource.com>
Thu, 28 May 2009 10:54:20 +0000 (11:54 +0100)
committerSteven Smith <ssmith@weybridge.uk.xensource.com>
Thu, 28 May 2009 10:54:20 +0000 (11:54 +0100)
drivers/net/s2io/*.h due to exceedingly generic names.

drivers/net/s2io-regs.h
drivers/net/s2io.c
drivers/net/s2io.h
drivers/net/s2io/kcompat.h [new file with mode: 0644]
drivers/net/s2io/spdm_cfg.h [new file with mode: 0644]
drivers/net/s2io/util.h [new file with mode: 0644]

index f8274f8941ea4cb383938bf7e01febdbaad51da5..9497a9ffab2f373c0f29c6163189d334c25e5564 100644 (file)
@@ -1,6 +1,6 @@
 /************************************************************************
- * regs.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
- * Copyright(c) 2002-2007 Neterion Inc.
+ * regs.h: A Linux PCI-X Ethernet driver for S2IO 10GbE Server NIC
+ * Copyright(c) 2002-2005 Neterion Inc.
 
  * This software may be used and distributed according to the terms of
  * the GNU General Public License (GPL), incorporated herein by reference.
@@ -20,22 +20,22 @@ struct XENA_dev_config {
 
 /* General Control-Status Registers */
        u64 general_int_status;
-#define GEN_INTR_TXPIC             s2BIT(0)
-#define GEN_INTR_TXDMA             s2BIT(1)
-#define GEN_INTR_TXMAC             s2BIT(2)
-#define GEN_INTR_TXXGXS            s2BIT(3)
-#define GEN_INTR_TXTRAFFIC         s2BIT(8)
-#define GEN_INTR_RXPIC             s2BIT(32)
-#define GEN_INTR_RXDMA             s2BIT(33)
-#define GEN_INTR_RXMAC             s2BIT(34)
-#define GEN_INTR_MC                s2BIT(35)
-#define GEN_INTR_RXXGXS            s2BIT(36)
-#define GEN_INTR_RXTRAFFIC         s2BIT(40)
-#define GEN_ERROR_INTR             GEN_INTR_TXPIC | GEN_INTR_RXPIC | \
-                                   GEN_INTR_TXDMA | GEN_INTR_RXDMA | \
-                                   GEN_INTR_TXMAC | GEN_INTR_RXMAC | \
-                                   GEN_INTR_TXXGXS| GEN_INTR_RXXGXS| \
-                                   GEN_INTR_MC
+#define GEN_INTR_TXPIC                         S2BIT(0)
+#define GEN_INTR_TXDMA                         S2BIT(1)
+#define GEN_INTR_TXMAC                         S2BIT(2)
+#define GEN_INTR_TXXGXS                                S2BIT(3)
+#define GEN_INTR_TXTRAFFIC                     S2BIT(8)
+#define GEN_INTR_RXPIC                         S2BIT(32)
+#define GEN_INTR_RXDMA                         S2BIT(33)
+#define GEN_INTR_RXMAC                         S2BIT(34)
+#define GEN_INTR_MC                            S2BIT(35)
+#define GEN_INTR_RXXGXS                                S2BIT(36)
+#define GEN_INTR_RXTRAFFIC                     S2BIT(40)
+#define GEN_ERROR_INTR                                 (GEN_INTR_TXPIC | \
+                                       GEN_INTR_TXDMA | GEN_INTR_RXDMA | \
+                                       GEN_INTR_TXMAC | GEN_INTR_RXMAC | \
+                                       GEN_INTR_TXXGXS | GEN_INTR_RXXGXS | \
+                                       GEN_INTR_RXPIC | GEN_INTR_MC)
 
        u64 general_int_mask;
 
@@ -43,100 +43,100 @@ struct XENA_dev_config {
 
        u64 sw_reset;
 /* XGXS must be removed from reset only once. */
-#define SW_RESET_XENA              vBIT(0xA5,0,8)
-#define SW_RESET_FLASH             vBIT(0xA5,8,8)
-#define SW_RESET_EOI               vBIT(0xA5,16,8)
-#define SW_RESET_ALL               (SW_RESET_XENA     |   \
-                                    SW_RESET_FLASH    |   \
-                                    SW_RESET_EOI)
+#define SW_RESET_XENA                          vBIT(0xA5, 0, 8)
+#define SW_RESET_FLASH                         vBIT(0xA5, 8, 8)
+#define SW_RESET_EOI                           vBIT(0xA5, 16, 8)
+#define SW_RESET_ALL                           (SW_RESET_XENA  | \
+                                               SW_RESET_FLASH  | \
+                                               SW_RESET_EOI)
 /* The SW_RESET register must read this value after a successful reset. */
 #define        SW_RESET_RAW_VAL                        0xA5000000
 
 
        u64 adapter_status;
-#define ADAPTER_STATUS_TDMA_READY          s2BIT(0)
-#define ADAPTER_STATUS_RDMA_READY          s2BIT(1)
-#define ADAPTER_STATUS_PFC_READY           s2BIT(2)
-#define ADAPTER_STATUS_TMAC_BUF_EMPTY      s2BIT(3)
-#define ADAPTER_STATUS_PIC_QUIESCENT       s2BIT(5)
-#define ADAPTER_STATUS_RMAC_REMOTE_FAULT   s2BIT(6)
-#define ADAPTER_STATUS_RMAC_LOCAL_FAULT    s2BIT(7)
-#define ADAPTER_STATUS_RMAC_PCC_IDLE       vBIT(0xFF,8,8)
-#define ADAPTER_STATUS_RMAC_PCC_FOUR_IDLE  vBIT(0x0F,8,8)
-#define ADAPTER_STATUS_RC_PRC_QUIESCENT    vBIT(0xFF,16,8)
-#define ADAPTER_STATUS_MC_DRAM_READY       s2BIT(24)
-#define ADAPTER_STATUS_MC_QUEUES_READY     s2BIT(25)
-#define ADAPTER_STATUS_RIC_RUNNING         s2BIT(26)
-#define ADAPTER_STATUS_M_PLL_LOCK          s2BIT(30)
-#define ADAPTER_STATUS_P_PLL_LOCK          s2BIT(31)
+#define ADAPTER_STATUS_TDMA_READY              S2BIT(0)
+#define ADAPTER_STATUS_RDMA_READY              S2BIT(1)
+#define ADAPTER_STATUS_PFC_READY               S2BIT(2)
+#define ADAPTER_STATUS_TMAC_BUF_EMPTY          S2BIT(3)
+#define ADAPTER_STATUS_PIC_QUIESCENT           S2BIT(5)
+#define ADAPTER_STATUS_RMAC_REMOTE_FAULT       S2BIT(6)
+#define ADAPTER_STATUS_RMAC_LOCAL_FAULT                S2BIT(7)
+#define ADAPTER_STATUS_RMAC_PCC_IDLE           vBIT(0xFF, 8, 8)
+#define ADAPTER_STATUS_RMAC_PCC_FOUR_IDLE      vBIT(0x0F, 8, 8)
+#define ADAPTER_STATUS_RC_PRC_QUIESCENT                vBIT(0xFF, 16, 8)
+#define ADAPTER_STATUS_MC_DRAM_READY           S2BIT(24)
+#define ADAPTER_STATUS_MC_QUEUES_READY         S2BIT(25)
+#define ADAPTER_STATUS_RIC_RUNNING             S2BIT(26)
+#define ADAPTER_STATUS_M_PLL_LOCK              S2BIT(30)
+#define ADAPTER_STATUS_P_PLL_LOCK              S2BIT(31)
 
        u64 adapter_control;
-#define ADAPTER_CNTL_EN                    s2BIT(7)
-#define ADAPTER_EOI_TX_ON                  s2BIT(15)
-#define ADAPTER_LED_ON                     s2BIT(23)
-#define ADAPTER_UDPI(val)                  vBIT(val,36,4)
-#define ADAPTER_WAIT_INT                   s2BIT(48)
-#define ADAPTER_ECC_EN                     s2BIT(55)
+#define ADAPTER_CNTL_EN                                S2BIT(7)
+#define ADAPTER_EOI_TX_ON                      S2BIT(15)
+#define ADAPTER_LED_ON                         S2BIT(23)
+#define ADAPTER_UDPI(val)                      vBIT(val, 36, 4)
+#define ADAPTER_WAIT_INT                       S2BIT(48)
+#define ADAPTER_ECC_EN                         S2BIT(55)
 
        u64 serr_source;
-#define SERR_SOURCE_PIC                        s2BIT(0)
-#define SERR_SOURCE_TXDMA              s2BIT(1)
-#define SERR_SOURCE_RXDMA              s2BIT(2)
-#define SERR_SOURCE_MAC                 s2BIT(3)
-#define SERR_SOURCE_MC                  s2BIT(4)
-#define SERR_SOURCE_XGXS                s2BIT(5)
-#define        SERR_SOURCE_ANY                 (SERR_SOURCE_PIC        | \
-                                       SERR_SOURCE_TXDMA       | \
-                                       SERR_SOURCE_RXDMA       | \
-                                       SERR_SOURCE_MAC         | \
-                                       SERR_SOURCE_MC          | \
-                                       SERR_SOURCE_XGXS)
+#define SERR_SOURCE_PIC                                S2BIT(0)
+#define SERR_SOURCE_TXDMA                      S2BIT(1)
+#define SERR_SOURCE_RXDMA                      S2BIT(2)
+#define SERR_SOURCE_MAC                                S2BIT(3)
+#define SERR_SOURCE_MC                         S2BIT(4)
+#define SERR_SOURCE_XGXS                       S2BIT(5)
+#define        SERR_SOURCE_ANY                         (SERR_SOURCE_PIC | \
+                                               SERR_SOURCE_TXDMA | \
+                                               SERR_SOURCE_RXDMA | \
+                                               SERR_SOURCE_MAC  | \
+                                               SERR_SOURCE_MC   | \
+                                               SERR_SOURCE_XGXS)
 
        u64 pci_mode;
-#define        GET_PCI_MODE(val)               ((val & vBIT(0xF, 0, 4)) >> 60)
-#define        PCI_MODE_PCI_33                 0
-#define        PCI_MODE_PCI_66                 0x1
-#define        PCI_MODE_PCIX_M1_66             0x2
-#define        PCI_MODE_PCIX_M1_100            0x3
-#define        PCI_MODE_PCIX_M1_133            0x4
-#define        PCI_MODE_PCIX_M2_66             0x5
-#define        PCI_MODE_PCIX_M2_100            0x6
-#define        PCI_MODE_PCIX_M2_133            0x7
-#define        PCI_MODE_UNSUPPORTED            s2BIT(0)
-#define        PCI_MODE_32_BITS                s2BIT(8)
-#define        PCI_MODE_UNKNOWN_MODE           s2BIT(9)
+#define        GET_PCI_MODE(val)                       ((val & vBIT(0xF, 0, 4)) >> 60)
+#define        PCI_MODE_PCI_33                         0
+#define        PCI_MODE_PCI_66                         0x1
+#define        PCI_MODE_PCIX_M1_66                     0x2
+#define        PCI_MODE_PCIX_M1_100                    0x3
+#define        PCI_MODE_PCIX_M1_133                    0x4
+#define        PCI_MODE_PCIX_M2_66                     0x5
+#define        PCI_MODE_PCIX_M2_100                    0x6
+#define        PCI_MODE_PCIX_M2_133                    0x7
+#define        PCI_MODE_UNSUPPORTED                    S2BIT(0)
+#define        PCI_MODE_32_BITS                        S2BIT(8)
+#define        PCI_MODE_UNKNOWN_MODE                   S2BIT(9)
 
        u8 unused_0[0x800 - 0x128];
 
 /* PCI-X Controller registers */
        u64 pic_int_status;
        u64 pic_int_mask;
-#define PIC_INT_TX                     s2BIT(0)
-#define PIC_INT_FLSH                   s2BIT(1)
-#define PIC_INT_MDIO                   s2BIT(2)
-#define PIC_INT_IIC                    s2BIT(3)
-#define PIC_INT_GPIO                   s2BIT(4)
-#define PIC_INT_RX                     s2BIT(32)
+#define PIC_INT_TX                             S2BIT(0)
+#define PIC_INT_FLSH                           S2BIT(1)
+#define PIC_INT_MDIO                           S2BIT(2)
+#define PIC_INT_IIC                            S2BIT(3)
+#define PIC_INT_GPIO                           S2BIT(4)
+#define PIC_INT_RX                             S2BIT(32)
 
        u64 txpic_int_reg;
        u64 txpic_int_mask;
-#define PCIX_INT_REG_ECC_SG_ERR                s2BIT(0)
-#define PCIX_INT_REG_ECC_DB_ERR                s2BIT(1)
-#define PCIX_INT_REG_FLASHR_R_FSM_ERR          s2BIT(8)
-#define PCIX_INT_REG_FLASHR_W_FSM_ERR          s2BIT(9)
-#define PCIX_INT_REG_INI_TX_FSM_SERR           s2BIT(10)
-#define PCIX_INT_REG_INI_TXO_FSM_ERR           s2BIT(11)
-#define PCIX_INT_REG_TRT_FSM_SERR              s2BIT(13)
-#define PCIX_INT_REG_SRT_FSM_SERR              s2BIT(14)
-#define PCIX_INT_REG_PIFR_FSM_SERR             s2BIT(15)
-#define PCIX_INT_REG_WRC_TX_SEND_FSM_SERR      s2BIT(21)
-#define PCIX_INT_REG_RRC_TX_REQ_FSM_SERR       s2BIT(23)
-#define PCIX_INT_REG_INI_RX_FSM_SERR           s2BIT(48)
-#define PCIX_INT_REG_RA_RX_FSM_SERR            s2BIT(50)
+#define PCIX_INT_REG_ECC_SG_ERR                        S2BIT(0)
+#define PCIX_INT_REG_ECC_DB_ERR                        S2BIT(1)
+#define PCIX_INT_REG_FLASHR_R_FSM_ERR          S2BIT(8)
+#define PCIX_INT_REG_FLASHR_W_FSM_ERR          S2BIT(9)
+#define PCIX_INT_REG_INI_TX_FSM_SERR           S2BIT(10)
+#define PCIX_INT_REG_INI_TXO_FSM_ERR           S2BIT(11)
+#define PCIX_INT_REG_TRT_FSM_SERR              S2BIT(13)
+#define PCIX_INT_REG_SRT_FSM_SERR              S2BIT(14)
+#define PCIX_INT_REG_PIFR_FSM_SERR             S2BIT(15)
+#define PCIX_INT_REG_WRC_TX_SEND_FSM_SERR      S2BIT(21)
+#define PCIX_INT_REG_RRC_TX_REQ_FSM_SERR       S2BIT(23)
+#define PCIX_INT_REG_INI_RX_FSM_SERR           S2BIT(48)
+#define PCIX_INT_REG_RA_RX_FSM_SERR            S2BIT(50)
 /*
-#define PCIX_INT_REG_WRC_RX_SEND_FSM_SERR      s2BIT(52)
-#define PCIX_INT_REG_RRC_RX_REQ_FSM_SERR       s2BIT(54)
-#define PCIX_INT_REG_RRC_RX_SPLIT_FSM_SERR     s2BIT(58)
+#define PCIX_INT_REG_WRC_RX_SEND_FSM_SERR      S2BIT(52)
+#define PCIX_INT_REG_RRC_RX_REQ_FSM_SERR       S2BIT(54)
+#define PCIX_INT_REG_RRC_RX_SPLIT_FSM_SERR     S2BIT(58)
 */
        u64 txpic_alarms;
        u64 rxpic_int_reg;
@@ -145,92 +145,92 @@ struct XENA_dev_config {
 
        u64 flsh_int_reg;
        u64 flsh_int_mask;
-#define PIC_FLSH_INT_REG_CYCLE_FSM_ERR         s2BIT(63)
-#define PIC_FLSH_INT_REG_ERR                   s2BIT(62)
+#define PIC_FLSH_INT_REG_CYCLE_FSM_ERR         S2BIT(63)
+#define PIC_FLSH_INT_REG_ERR                   S2BIT(62)
        u64 flash_alarms;
 
        u64 mdio_int_reg;
        u64 mdio_int_mask;
-#define MDIO_INT_REG_MDIO_BUS_ERR              s2BIT(0)
-#define MDIO_INT_REG_DTX_BUS_ERR               s2BIT(8)
-#define MDIO_INT_REG_LASI                      s2BIT(39)
+#define MDIO_INT_REG_MDIO_BUS_ERR              S2BIT(0)
+#define MDIO_INT_REG_DTX_BUS_ERR               S2BIT(8)
+#define MDIO_INT_REG_LASI                      S2BIT(39)
        u64 mdio_alarms;
 
        u64 iic_int_reg;
        u64 iic_int_mask;
-#define IIC_INT_REG_BUS_FSM_ERR                s2BIT(4)
-#define IIC_INT_REG_BIT_FSM_ERR                s2BIT(5)
-#define IIC_INT_REG_CYCLE_FSM_ERR              s2BIT(6)
-#define IIC_INT_REG_REQ_FSM_ERR                s2BIT(7)
-#define IIC_INT_REG_ACK_ERR                    s2BIT(8)
+#define IIC_INT_REG_BUS_FSM_ERR                        S2BIT(4)
+#define IIC_INT_REG_BIT_FSM_ERR                        S2BIT(5)
+#define IIC_INT_REG_CYCLE_FSM_ERR              S2BIT(6)
+#define IIC_INT_REG_REQ_FSM_ERR                        S2BIT(7)
+#define IIC_INT_REG_ACK_ERR                    S2BIT(8)
        u64 iic_alarms;
 
        u8 unused4[0x08];
 
        u64 gpio_int_reg;
-#define GPIO_INT_REG_DP_ERR_INT                s2BIT(0)
-#define GPIO_INT_REG_LINK_DOWN                 s2BIT(1)
-#define GPIO_INT_REG_LINK_UP                   s2BIT(2)
+#define GPIO_INT_REG_DP_ERR_INT                        S2BIT(0)
+#define GPIO_INT_REG_LINK_DOWN                 S2BIT(1)
+#define GPIO_INT_REG_LINK_UP                   S2BIT(2)
        u64 gpio_int_mask;
-#define GPIO_INT_MASK_LINK_DOWN                s2BIT(1)
-#define GPIO_INT_MASK_LINK_UP                  s2BIT(2)
+#define GPIO_INT_MASK_LINK_DOWN                        S2BIT(1)
+#define GPIO_INT_MASK_LINK_UP                  S2BIT(2)
        u64 gpio_alarms;
 
        u8 unused5[0x38];
 
        u64 tx_traffic_int;
-#define TX_TRAFFIC_INT_n(n)                    s2BIT(n)
+#define TX_TRAFFIC_INT_n(n)                    S2BIT(n)
        u64 tx_traffic_mask;
 
        u64 rx_traffic_int;
-#define RX_TRAFFIC_INT_n(n)                    s2BIT(n)
+#define RX_TRAFFIC_INT(n)                      S2BIT(n)
        u64 rx_traffic_mask;
 
 /* PIC Control registers */
        u64 pic_control;
-#define PIC_CNTL_RX_ALARM_MAP_1                s2BIT(0)
-#define PIC_CNTL_SHARED_SPLITS(n)              vBIT(n,11,5)
+#define PIC_CNTL_RX_ALARM_MAP_1                        S2BIT(0)
+#define PIC_CNTL_SHARED_SPLITS(n)              vBIT(n, 11, 5)
 
        u64 swapper_ctrl;
-#define SWAPPER_CTRL_PIF_R_FE                  s2BIT(0)
-#define SWAPPER_CTRL_PIF_R_SE                  s2BIT(1)
-#define SWAPPER_CTRL_PIF_W_FE                  s2BIT(8)
-#define SWAPPER_CTRL_PIF_W_SE                  s2BIT(9)
-#define SWAPPER_CTRL_TXP_FE                    s2BIT(16)
-#define SWAPPER_CTRL_TXP_SE                    s2BIT(17)
-#define SWAPPER_CTRL_TXD_R_FE                  s2BIT(18)
-#define SWAPPER_CTRL_TXD_R_SE                  s2BIT(19)
-#define SWAPPER_CTRL_TXD_W_FE                  s2BIT(20)
-#define SWAPPER_CTRL_TXD_W_SE                  s2BIT(21)
-#define SWAPPER_CTRL_TXF_R_FE                  s2BIT(22)
-#define SWAPPER_CTRL_TXF_R_SE                  s2BIT(23)
-#define SWAPPER_CTRL_RXD_R_FE                  s2BIT(32)
-#define SWAPPER_CTRL_RXD_R_SE                  s2BIT(33)
-#define SWAPPER_CTRL_RXD_W_FE                  s2BIT(34)
-#define SWAPPER_CTRL_RXD_W_SE                  s2BIT(35)
-#define SWAPPER_CTRL_RXF_W_FE                  s2BIT(36)
-#define SWAPPER_CTRL_RXF_W_SE                  s2BIT(37)
-#define SWAPPER_CTRL_XMSI_FE                   s2BIT(40)
-#define SWAPPER_CTRL_XMSI_SE                   s2BIT(41)
-#define SWAPPER_CTRL_STATS_FE                  s2BIT(48)
-#define SWAPPER_CTRL_STATS_SE                  s2BIT(49)
+#define SWAPPER_CTRL_PIF_R_FE                  S2BIT(0)
+#define SWAPPER_CTRL_PIF_R_SE                  S2BIT(1)
+#define SWAPPER_CTRL_PIF_W_FE                  S2BIT(8)
+#define SWAPPER_CTRL_PIF_W_SE                  S2BIT(9)
+#define SWAPPER_CTRL_TXP_FE                    S2BIT(16)
+#define SWAPPER_CTRL_TXP_SE                    S2BIT(17)
+#define SWAPPER_CTRL_TXD_R_FE                  S2BIT(18)
+#define SWAPPER_CTRL_TXD_R_SE                  S2BIT(19)
+#define SWAPPER_CTRL_TXD_W_FE                  S2BIT(20)
+#define SWAPPER_CTRL_TXD_W_SE                  S2BIT(21)
+#define SWAPPER_CTRL_TXF_R_FE                  S2BIT(22)
+#define SWAPPER_CTRL_TXF_R_SE                  S2BIT(23)
+#define SWAPPER_CTRL_RXD_R_FE                  S2BIT(32)
+#define SWAPPER_CTRL_RXD_R_SE                  S2BIT(33)
+#define SWAPPER_CTRL_RXD_W_FE                  S2BIT(34)
+#define SWAPPER_CTRL_RXD_W_SE                  S2BIT(35)
+#define SWAPPER_CTRL_RXF_W_FE                  S2BIT(36)
+#define SWAPPER_CTRL_RXF_W_SE                  S2BIT(37)
+#define SWAPPER_CTRL_XMSI_FE                   S2BIT(40)
+#define SWAPPER_CTRL_XMSI_SE                   S2BIT(41)
+#define SWAPPER_CTRL_STATS_FE                  S2BIT(48)
+#define SWAPPER_CTRL_STATS_SE                  S2BIT(49)
 
        u64 pif_rd_swapper_fb;
-#define IF_RD_SWAPPER_FB                            0x0123456789ABCDEF
+#define IF_RD_SWAPPER_FB                       0x0123456789ABCDEF
 
        u64 scheduled_int_ctrl;
-#define SCHED_INT_CTRL_TIMER_EN                s2BIT(0)
-#define SCHED_INT_CTRL_ONE_SHOT                s2BIT(1)
-#define SCHED_INT_CTRL_INT2MSI(val)            vBIT(val,10,6)
-#define SCHED_INT_PERIOD                       TBD
+#define SCHED_INT_CTRL_TIMER_EN                        S2BIT(0)
+#define SCHED_INT_CTRL_ONE_SHOT                        S2BIT(1)
+#define SCHED_INT_CTRL_INT2MSI(val)            vBIT(val, 10, 6)
+#define SCHED_INT_PERIOD                       TBD
 
        u64 txreqtimeout;
-#define TXREQTO_VAL(val)                                               vBIT(val,0,32)
-#define TXREQTO_EN                                                             s2BIT(63)
+#define TXREQTO_VAL(val)                       vBIT(val, 0, 32)
+#define TXREQTO_EN                             S2BIT(63)
 
        u64 statsreqtimeout;
-#define STATREQTO_VAL(n)                       TBD
-#define STATREQTO_EN                           s2BIT(63)
+#define STATREQTO_VAL(n)                       TBD
+#define STATREQTO_EN                           S2BIT(63)
 
        u64 read_retry_delay;
        u64 read_retry_acceleration;
@@ -251,141 +251,148 @@ struct XENA_dev_config {
 #define TX_MAT_SET(fifo, msi)                  vBIT(msi, (8 * fifo), 8)
 
        u64 xmsi_mask_reg;
+#define DISABLE_MSI_RX(val, ring)              vBIT(val, (ring + 1), 1)
+#define ENABLE_MSI_RX(val, ring)                       vBIT(val, (ring + 1), 1)
        u64 stat_byte_cnt;
-#define STAT_BC(n)                              vBIT(n,4,12)
+#define STAT_BC(n)                             vBIT(n, 4, 12)
 
        /* Automated statistics collection */
        u64 stat_cfg;
-#define STAT_CFG_STAT_EN           s2BIT(0)
-#define STAT_CFG_ONE_SHOT_EN       s2BIT(1)
-#define STAT_CFG_STAT_NS_EN        s2BIT(8)
-#define STAT_CFG_STAT_RO           s2BIT(9)
-#define STAT_TRSF_PER(n)           TBD
-#define        PER_SEC                                    0x208d5
-#define        SET_UPDT_PERIOD(n)                 vBIT((PER_SEC*n),32,32)
-#define        SET_UPDT_CLICKS(val)               vBIT(val, 32, 32)
+#define STAT_CFG_STAT_EN                       S2BIT(0)
+#define STAT_CFG_ONE_SHOT_EN                   S2BIT(1)
+#define STAT_CFG_STAT_NS_EN                    S2BIT(8)
+#define STAT_CFG_STAT_RO                       S2BIT(9)
+#define STAT_TRSF_PER(n)                       TBD
+#define        PER_SEC                                 0x208d5
+#define        SET_UPDT_PERIOD(n)                      vBIT((PER_SEC*n), 32, 32)
+#define        SET_UPDT_CLICKS(val)                    vBIT(val, 32, 32)
 
        u64 stat_addr;
 
        /* General Configuration */
        u64 mdio_control;
-#define MDIO_MMD_INDX_ADDR(val)                vBIT(val, 0, 16)
-#define MDIO_MMD_DEV_ADDR(val)         vBIT(val, 19, 5)
-#define MDIO_MMD_PMA_DEV_ADDR          0x1
-#define MDIO_MMD_PMD_DEV_ADDR          0x1
-#define MDIO_MMD_WIS_DEV_ADDR          0x2
-#define MDIO_MMD_PCS_DEV_ADDR          0x3
-#define MDIO_MMD_PHYXS_DEV_ADDR                0x4
-#define MDIO_MMS_PRT_ADDR(val)         vBIT(val, 27, 5)
-#define MDIO_CTRL_START_TRANS(val)     vBIT(val, 56, 4)
-#define MDIO_OP(val)                   vBIT(val, 60, 2)
-#define MDIO_OP_ADDR_TRANS             0x0
-#define MDIO_OP_WRITE_TRANS            0x1
-#define MDIO_OP_READ_POST_INC_TRANS    0x2
-#define MDIO_OP_READ_TRANS             0x3
-#define MDIO_MDIO_DATA(val)            vBIT(val, 32, 16)
+#define MDIO_MMD_INDX_ADDR(val)                        vBIT(val, 0, 16)
+#define MDIO_MMD_DEV_ADDR(val)                 vBIT(val, 19, 5)
+#define MDIO_MMD_PMA_DEV_ADDR                  0x1
+#define MDIO_MMD_PMD_DEV_ADDR                  0x1
+#define MDIO_MMD_WIS_DEV_ADDR                  0x2
+#define MDIO_MMD_PCS_DEV_ADDR                  0x3
+#define MDIO_MMD_PHYXS_DEV_ADDR                        0x4
+#define MDIO_MMS_PRT_ADDR(val)                 vBIT(val, 27, 5)
+#define MDIO_CTRL_START_TRANS(val)             vBIT(val, 56, 4)
+#define MDIO_OP(val)                           vBIT(val, 60, 2)
+#define MDIO_OP_ADDR_TRANS                     0x0
+#define MDIO_OP_WRITE_TRANS                    0x1
+#define MDIO_OP_READ_POST_INC_TRANS            0x2
+#define MDIO_OP_READ_TRANS                     0x3
+#define MDIO_MDIO_DATA(val)                    vBIT(val, 32, 16)
 
        u64 dtx_control;
 
        u64 i2c_control;
-#define        I2C_CONTROL_DEV_ID(id)          vBIT(id,1,3)
-#define        I2C_CONTROL_ADDR(addr)          vBIT(addr,5,11)
-#define        I2C_CONTROL_BYTE_CNT(cnt)       vBIT(cnt,22,2)
-#define        I2C_CONTROL_READ                        s2BIT(24)
-#define        I2C_CONTROL_NACK                        s2BIT(25)
-#define        I2C_CONTROL_CNTL_START          vBIT(0xE,28,4)
-#define        I2C_CONTROL_CNTL_END(val)       (val & vBIT(0x1,28,4))
-#define        I2C_CONTROL_GET_DATA(val)       (u32)(val & 0xFFFFFFFF)
-#define        I2C_CONTROL_SET_DATA(val)       vBIT(val,32,32)
+#define        I2C_CONTROL_DEV_ID(id)                  vBIT(id, 1, 3)
+#define        I2C_CONTROL_ADDR(addr)                  vBIT(addr, 5, 11)
+#define        I2C_CONTROL_BYTE_CNT(cnt)               vBIT(cnt, 22, 2)
+#define        I2C_CONTROL_READ                        S2BIT(24)
+#define        I2C_CONTROL_NACK                        S2BIT(25)
+#define        I2C_CONTROL_CNTL_START                  vBIT(0xE, 28, 4)
+#define        I2C_CONTROL_CNTL_END(val)               (val & vBIT(0x1, 28, 4))
+#define        I2C_CONTROL_GET_DATA(val)               (u32)(val & 0xFFFFFFFF)
+#define        I2C_CONTROL_SET_DATA(val)               vBIT(val, 32, 32)
 
        u64 gpio_control;
-#define GPIO_CTRL_GPIO_0               s2BIT(8)
+#define GPIO_CTRL_GPIO_0                       S2BIT(8)
        u64 misc_control;
-#define FAULT_BEHAVIOUR                        s2BIT(0)
-#define EXT_REQ_EN                     s2BIT(1)
-#define MISC_LINK_STABILITY_PRD(val)   vBIT(val,29,3)
-
+#define FAULT_BEHAVIOUR                                S2BIT(0)
+#define EXT_REQ_EN                             S2BIT(1)
+#define MISC_LINK_STABILITY_PRD(val)           vBIT(val, 29, 3)
        u8 unused7_1[0x230 - 0x208];
 
        u64 pic_control2;
        u64 ini_dperr_ctrl;
 
        u64 wreq_split_mask;
-#define        WREQ_SPLIT_MASK_SET_MASK(val)   vBIT(val, 52, 12)
+#define        WREQ_SPLIT_MASK_SET_MASK(val)           vBIT(val, 52, 12)
+
+       u8 unused7_2[0x318 - 0x248];
+
+       u64 spdm_bir_offset;
+       u64 spdm_overwrite;
 
-       u8 unused7_2[0x800 - 0x248];
+       u8 unused7_3[0x368 - 0x328];
+       u64 spdm_structure;
+       u8 unused7_4[0x800 - 0x370];
 
 /* TxDMA registers */
        u64 txdma_int_status;
        u64 txdma_int_mask;
-#define TXDMA_PFC_INT                  s2BIT(0)
-#define TXDMA_TDA_INT                  s2BIT(1)
-#define TXDMA_PCC_INT                  s2BIT(2)
-#define TXDMA_TTI_INT                  s2BIT(3)
-#define TXDMA_LSO_INT                  s2BIT(4)
-#define TXDMA_TPA_INT                  s2BIT(5)
-#define TXDMA_SM_INT                   s2BIT(6)
+#define TXDMA_PFC_INT                          S2BIT(0)
+#define TXDMA_TDA_INT                          S2BIT(1)
+#define TXDMA_PCC_INT                          S2BIT(2)
+#define TXDMA_TTI_INT                          S2BIT(3)
+#define TXDMA_LSO_INT                          S2BIT(4)
+#define TXDMA_TPA_INT                          S2BIT(5)
+#define TXDMA_SM_INT                           S2BIT(6)
        u64 pfc_err_reg;
-#define PFC_ECC_SG_ERR                 s2BIT(7)
-#define PFC_ECC_DB_ERR                 s2BIT(15)
-#define PFC_SM_ERR_ALARM               s2BIT(23)
-#define PFC_MISC_0_ERR                 s2BIT(31)
-#define PFC_MISC_1_ERR                 s2BIT(32)
-#define PFC_PCIX_ERR                   s2BIT(39)
+#define PFC_ECC_SG_ERR                         S2BIT(7)
+#define PFC_ECC_DB_ERR                         S2BIT(15)
+#define PFC_SM_ERR_ALARM                       S2BIT(23)
+#define PFC_MISC_0_ERR                         S2BIT(31)
+#define PFC_MISC_1_ERR                         S2BIT(32)
+#define PFC_PCIX_ERR                           S2BIT(39)
        u64 pfc_err_mask;
        u64 pfc_err_alarm;
 
        u64 tda_err_reg;
-#define TDA_Fn_ECC_SG_ERR              vBIT(0xff,0,8)
-#define TDA_Fn_ECC_DB_ERR              vBIT(0xff,8,8)
-#define TDA_SM0_ERR_ALARM              s2BIT(22)
-#define TDA_SM1_ERR_ALARM              s2BIT(23)
-#define TDA_PCIX_ERR                   s2BIT(39)
+#define TDA_Fn_ECC_SG_ERR                      vBIT(0xff, 0, 8)
+#define TDA_Fn_ECC_DB_ERR                      vBIT(0xff, 8, 8)
+#define TDA_SM0_ERR_ALARM                      S2BIT(22)
+#define TDA_SM1_ERR_ALARM                      S2BIT(23)
+#define TDA_PCIX_ERR                           S2BIT(39)
        u64 tda_err_mask;
        u64 tda_err_alarm;
 
        u64 pcc_err_reg;
-#define PCC_FB_ECC_SG_ERR              vBIT(0xFF,0,8)
-#define PCC_TXB_ECC_SG_ERR             vBIT(0xFF,8,8)
-#define PCC_FB_ECC_DB_ERR              vBIT(0xFF,16, 8)
-#define PCC_TXB_ECC_DB_ERR             vBIT(0xff,24,8)
-#define PCC_SM_ERR_ALARM               vBIT(0xff,32,8)
-#define PCC_WR_ERR_ALARM               vBIT(0xff,40,8)
-#define PCC_N_SERR                     vBIT(0xff,48,8)
-#define PCC_6_COF_OV_ERR               s2BIT(56)
-#define PCC_7_COF_OV_ERR               s2BIT(57)
-#define PCC_6_LSO_OV_ERR               s2BIT(58)
-#define PCC_7_LSO_OV_ERR               s2BIT(59)
-#define PCC_ENABLE_FOUR                        vBIT(0x0F,0,8)
+#define PCC_FB_ECC_SG_ERR                      vBIT(0xFF, 0, 8)
+#define PCC_TXB_ECC_SG_ERR                     vBIT(0xFF, 8, 8)
+#define PCC_FB_ECC_DB_ERR                      vBIT(0xFF, 16, 8)
+#define PCC_TXB_ECC_DB_ERR                     vBIT(0xff, 24, 8)
+#define PCC_SM_ERR_ALARM                       vBIT(0xff, 32, 8)
+#define PCC_WR_ERR_ALARM                       vBIT(0xff, 40, 8)
+#define PCC_N_SERR                             vBIT(0xff, 48, 8)
+#define PCC_6_COF_OV_ERR                       S2BIT(56)
+#define PCC_7_COF_OV_ERR                       S2BIT(57)
+#define PCC_6_LSO_OV_ERR                       S2BIT(58)
+#define PCC_7_LSO_OV_ERR                       S2BIT(59)
+#define PCC_ENABLE_FOUR                                vBIT(0x0F, 0, 8)
        u64 pcc_err_mask;
        u64 pcc_err_alarm;
 
        u64 tti_err_reg;
-#define TTI_ECC_SG_ERR                 s2BIT(7)
-#define TTI_ECC_DB_ERR                 s2BIT(15)
-#define TTI_SM_ERR_ALARM               s2BIT(23)
+#define TTI_ECC_SG_ERR                         S2BIT(7)
+#define TTI_ECC_DB_ERR                         S2BIT(15)
+#define TTI_SM_ERR_ALARM                       S2BIT(23)
        u64 tti_err_mask;
        u64 tti_err_alarm;
 
        u64 lso_err_reg;
-#define LSO6_SEND_OFLOW                        s2BIT(12)
-#define LSO7_SEND_OFLOW                        s2BIT(13)
-#define LSO6_ABORT                     s2BIT(14)
-#define LSO7_ABORT                     s2BIT(15)
-#define LSO6_SM_ERR_ALARM              s2BIT(22)
-#define LSO7_SM_ERR_ALARM              s2BIT(23)
+#define LSO6_SEND_OFLOW                                S2BIT(12)
+#define LSO7_SEND_OFLOW                                S2BIT(13)
+#define LSO6_ABORT                             S2BIT(14)
+#define LSO7_ABORT                             S2BIT(15)
+#define LSO6_SM_ERR_ALARM                      S2BIT(22)
+#define LSO7_SM_ERR_ALARM                      S2BIT(23)
        u64 lso_err_mask;
        u64 lso_err_alarm;
 
        u64 tpa_err_reg;
-#define TPA_TX_FRM_DROP                        s2BIT(7)
-#define TPA_SM_ERR_ALARM               s2BIT(23)
-
+#define TPA_TX_FRM_DROP                                S2BIT(7)
+#define TPA_SM_ERR_ALARM                       S2BIT(23)
        u64 tpa_err_mask;
        u64 tpa_err_alarm;
 
        u64 sm_err_reg;
-#define SM_SM_ERR_ALARM                        s2BIT(15)
+#define SM_SM_ERR_ALARM                                S2BIT(15)
        u64 sm_err_mask;
        u64 sm_err_alarm;
 
@@ -395,41 +402,41 @@ struct XENA_dev_config {
        u64 tx_dma_wrap_stat;
 
 /* Tx FIFO controller */
-#define X_MAX_FIFOS                        8
-#define X_FIFO_MAX_LEN                     0x1FFF      /*8191 */
+#define X_MAX_FIFOS                            8
+#define X_FIFO_MAX_LEN                         0x1FFF  /*8191 */
        u64 tx_fifo_partition_0;
-#define TX_FIFO_PARTITION_EN               s2BIT(0)
-#define TX_FIFO_PARTITION_0_PRI(val)       vBIT(val,5,3)
-#define TX_FIFO_PARTITION_0_LEN(val)       vBIT(val,19,13)
-#define TX_FIFO_PARTITION_1_PRI(val)       vBIT(val,37,3)
-#define TX_FIFO_PARTITION_1_LEN(val)       vBIT(val,51,13  )
+#define TX_FIFO_PARTITION_EN                   S2BIT(0)
+#define TX_FIFO_PARTITION_0_PRI(val)           vBIT(val, 5, 3)
+#define TX_FIFO_PARTITION_0_LEN(val)           vBIT(val, 19, 13)
+#define TX_FIFO_PARTITION_1_PRI(val)           vBIT(val, 37, 3)
+#define TX_FIFO_PARTITION_1_LEN(val)           vBIT(val, 51, 13)
 
        u64 tx_fifo_partition_1;
-#define TX_FIFO_PARTITION_2_PRI(val)       vBIT(val,5,3)
-#define TX_FIFO_PARTITION_2_LEN(val)       vBIT(val,19,13)
-#define TX_FIFO_PARTITION_3_PRI(val)       vBIT(val,37,3)
-#define TX_FIFO_PARTITION_3_LEN(val)       vBIT(val,51,13)
+#define TX_FIFO_PARTITION_2_PRI(val)           vBIT(val, 5, 3)
+#define TX_FIFO_PARTITION_2_LEN(val)           vBIT(val, 19, 13)
+#define TX_FIFO_PARTITION_3_PRI(val)           vBIT(val, 37, 3)
+#define TX_FIFO_PARTITION_3_LEN(val)           vBIT(val, 51, 13)
 
        u64 tx_fifo_partition_2;
-#define TX_FIFO_PARTITION_4_PRI(val)       vBIT(val,5,3)
-#define TX_FIFO_PARTITION_4_LEN(val)       vBIT(val,19,13)
-#define TX_FIFO_PARTITION_5_PRI(val)       vBIT(val,37,3)
-#define TX_FIFO_PARTITION_5_LEN(val)       vBIT(val,51,13)
+#define TX_FIFO_PARTITION_4_PRI(val)           vBIT(val, 5, 3)
+#define TX_FIFO_PARTITION_4_LEN(val)           vBIT(val, 19, 13)
+#define TX_FIFO_PARTITION_5_PRI(val)           vBIT(val, 37, 3)
+#define TX_FIFO_PARTITION_5_LEN(val)           vBIT(val, 51, 13)
 
        u64 tx_fifo_partition_3;
-#define TX_FIFO_PARTITION_6_PRI(val)       vBIT(val,5,3)
-#define TX_FIFO_PARTITION_6_LEN(val)       vBIT(val,19,13)
-#define TX_FIFO_PARTITION_7_PRI(val)       vBIT(val,37,3)
-#define TX_FIFO_PARTITION_7_LEN(val)       vBIT(val,51,13)
-
-#define TX_FIFO_PARTITION_PRI_0                 0      /* highest */
-#define TX_FIFO_PARTITION_PRI_1                 1
-#define TX_FIFO_PARTITION_PRI_2                 2
-#define TX_FIFO_PARTITION_PRI_3                 3
-#define TX_FIFO_PARTITION_PRI_4                 4
-#define TX_FIFO_PARTITION_PRI_5                 5
-#define TX_FIFO_PARTITION_PRI_6                 6
-#define TX_FIFO_PARTITION_PRI_7                 7      /* lowest */
+#define TX_FIFO_PARTITION_6_PRI(val)           vBIT(val, 5, 3)
+#define TX_FIFO_PARTITION_6_LEN(val)           vBIT(val, 19, 13)
+#define TX_FIFO_PARTITION_7_PRI(val)           vBIT(val, 37, 3)
+#define TX_FIFO_PARTITION_7_LEN(val)           vBIT(val, 51, 13)
+
+#define TX_FIFO_PARTITION_PRI_0                        0       /* highest */
+#define TX_FIFO_PARTITION_PRI_1                        1
+#define TX_FIFO_PARTITION_PRI_2                        2
+#define TX_FIFO_PARTITION_PRI_3                        3
+#define TX_FIFO_PARTITION_PRI_4                        4
+#define TX_FIFO_PARTITION_PRI_5                        5
+#define TX_FIFO_PARTITION_PRI_6                        6
+#define TX_FIFO_PARTITION_PRI_7                        7       /* lowest */
 
        u64 tx_w_round_robin_0;
        u64 tx_w_round_robin_1;
@@ -438,33 +445,32 @@ struct XENA_dev_config {
        u64 tx_w_round_robin_4;
 
        u64 tti_command_mem;
-#define TTI_CMD_MEM_WE                     s2BIT(7)
-#define TTI_CMD_MEM_STROBE_NEW_CMD         s2BIT(15)
-#define TTI_CMD_MEM_STROBE_BEING_EXECUTED  s2BIT(15)
-#define TTI_CMD_MEM_OFFSET(n)              vBIT(n,26,6)
+#define TTI_CMD_MEM_WE                         S2BIT(7)
+#define TTI_CMD_MEM_STROBE_NEW_CMD             S2BIT(15)
+#define TTI_CMD_MEM_STROBE_BEING_EXECUTED      S2BIT(15)
+#define TTI_CMD_MEM_OFFSET(n)                  vBIT(n, 26, 6)
 
        u64 tti_data1_mem;
-#define TTI_DATA1_MEM_TX_TIMER_VAL(n)      vBIT(n,6,26)
-#define TTI_DATA1_MEM_TX_TIMER_AC_CI(n)    vBIT(n,38,2)
-#define TTI_DATA1_MEM_TX_TIMER_AC_EN       s2BIT(38)
-#define TTI_DATA1_MEM_TX_TIMER_CI_EN       s2BIT(39)
-#define TTI_DATA1_MEM_TX_URNG_A(n)         vBIT(n,41,7)
-#define TTI_DATA1_MEM_TX_URNG_B(n)         vBIT(n,49,7)
-#define TTI_DATA1_MEM_TX_URNG_C(n)         vBIT(n,57,7)
+#define TTI_DATA1_MEM_TX_TIMER_VAL(n)          vBIT(n, 6, 26)
+#define TTI_DATA1_MEM_TX_TIMER_AC_CI(n)                vBIT(n, 38, 2)
+#define TTI_DATA1_MEM_TX_TIMER_AC_EN           S2BIT(38)
+#define TTI_DATA1_MEM_TX_TIMER_CI_EN           S2BIT(39)
+#define TTI_DATA1_MEM_TX_URNG_A(n)             vBIT(n, 41, 7)
+#define TTI_DATA1_MEM_TX_URNG_B(n)             vBIT(n, 49, 7)
+#define TTI_DATA1_MEM_TX_URNG_C(n)             vBIT(n, 57, 7)
 
        u64 tti_data2_mem;
-#define TTI_DATA2_MEM_TX_UFC_A(n)          vBIT(n,0,16)
-#define TTI_DATA2_MEM_TX_UFC_B(n)          vBIT(n,16,16)
-#define TTI_DATA2_MEM_TX_UFC_C(n)          vBIT(n,32,16)
-#define TTI_DATA2_MEM_TX_UFC_D(n)          vBIT(n,48,16)
+#define TTI_DATA2_MEM_TX_UFC_A(n)              vBIT(n, 0, 16)
+#define TTI_DATA2_MEM_TX_UFC_B(n)              vBIT(n, 16, 16)
+#define TTI_DATA2_MEM_TX_UFC_C(n)              vBIT(n, 32, 16)
+#define TTI_DATA2_MEM_TX_UFC_D(n)              vBIT(n, 48, 16)
 
 /* Tx Protocol assist */
        u64 tx_pa_cfg;
-#define TX_PA_CFG_IGNORE_FRM_ERR           s2BIT(1)
-#define TX_PA_CFG_IGNORE_SNAP_OUI          s2BIT(2)
-#define TX_PA_CFG_IGNORE_LLC_CTRL          s2BIT(3)
-#define        TX_PA_CFG_IGNORE_L2_ERR                    s2BIT(6)
-#define RX_PA_CFG_STRIP_VLAN_TAG               s2BIT(15)
+#define TX_PA_CFG_IGNORE_FRM_ERR               S2BIT(1)
+#define TX_PA_CFG_IGNORE_SNAP_OUI              S2BIT(2)
+#define TX_PA_CFG_IGNORE_LLC_CTRL              S2BIT(3)
+#define        TX_PA_CFG_IGNORE_L2_ERR                 S2BIT(6)
 
 /* Recent add, used only debug purposes. */
        u64 pcc_enable;
@@ -478,58 +484,58 @@ struct XENA_dev_config {
 /* RxDMA Registers */
        u64 rxdma_int_status;
        u64 rxdma_int_mask;
-#define RXDMA_INT_RC_INT_M             s2BIT(0)
-#define RXDMA_INT_RPA_INT_M            s2BIT(1)
-#define RXDMA_INT_RDA_INT_M            s2BIT(2)
-#define RXDMA_INT_RTI_INT_M            s2BIT(3)
+#define RXDMA_INT_RC_INT_M                     S2BIT(0)
+#define RXDMA_INT_RPA_INT_M                    S2BIT(1)
+#define RXDMA_INT_RDA_INT_M                    S2BIT(2)
+#define RXDMA_INT_RTI_INT_M                    S2BIT(3)
 
        u64 rda_err_reg;
-#define RDA_RXDn_ECC_SG_ERR            vBIT(0xFF,0,8)
-#define RDA_RXDn_ECC_DB_ERR            vBIT(0xFF,8,8)
-#define RDA_FRM_ECC_SG_ERR             s2BIT(23)
-#define RDA_FRM_ECC_DB_N_AERR          s2BIT(31)
-#define RDA_SM1_ERR_ALARM              s2BIT(38)
-#define RDA_SM0_ERR_ALARM              s2BIT(39)
-#define RDA_MISC_ERR                   s2BIT(47)
-#define RDA_PCIX_ERR                   s2BIT(55)
-#define RDA_RXD_ECC_DB_SERR            s2BIT(63)
+#define RDA_RXDn_ECC_SG_ERR                    vBIT(0xFF, 0, 8)
+#define RDA_RXDn_ECC_DB_ERR                    vBIT(0xFF, 8, 8)
+#define RDA_FRM_ECC_SG_ERR                     S2BIT(23)
+#define RDA_FRM_ECC_DB_N_AERR                  S2BIT(31)
+#define RDA_SM1_ERR_ALARM                      S2BIT(38)
+#define RDA_SM0_ERR_ALARM                      S2BIT(39)
+#define RDA_MISC_ERR                           S2BIT(47)
+#define RDA_PCIX_ERR                           S2BIT(55)
+#define RDA_RXD_ECC_DB_SERR                    S2BIT(63)
        u64 rda_err_mask;
        u64 rda_err_alarm;
 
        u64 rc_err_reg;
-#define RC_PRCn_ECC_SG_ERR             vBIT(0xFF,0,8)
-#define RC_PRCn_ECC_DB_ERR             vBIT(0xFF,8,8)
-#define RC_FTC_ECC_SG_ERR              s2BIT(23)
-#define RC_FTC_ECC_DB_ERR              s2BIT(31)
-#define RC_PRCn_SM_ERR_ALARM           vBIT(0xFF,32,8)
-#define RC_FTC_SM_ERR_ALARM            s2BIT(47)
-#define RC_RDA_FAIL_WR_Rn              vBIT(0xFF,48,8)
+#define RC_PRCn_ECC_SG_ERR                     vBIT(0xFF, 0, 8)
+#define RC_PRCn_ECC_DB_ERR                     vBIT(0xFF, 8, 8)
+#define RC_FTC_ECC_SG_ERR                      S2BIT(23)
+#define RC_FTC_ECC_DB_ERR                      S2BIT(31)
+#define RC_PRCn_SM_ERR_ALARM                   vBIT(0xFF, 32, 8)
+#define RC_FTC_SM_ERR_ALARM                    S2BIT(47)
+#define RC_RDA_FAIL_WR_Rn                      vBIT(0xFF, 48, 8)
        u64 rc_err_mask;
        u64 rc_err_alarm;
 
        u64 prc_pcix_err_reg;
-#define PRC_PCI_AB_RD_Rn               vBIT(0xFF,0,8)
-#define PRC_PCI_DP_RD_Rn               vBIT(0xFF,8,8)
-#define PRC_PCI_AB_WR_Rn               vBIT(0xFF,16,8)
-#define PRC_PCI_DP_WR_Rn               vBIT(0xFF,24,8)
-#define PRC_PCI_AB_F_WR_Rn             vBIT(0xFF,32,8)
-#define PRC_PCI_DP_F_WR_Rn             vBIT(0xFF,40,8)
+#define PRC_PCI_AB_RD_Rn                       vBIT(0xFF, 0, 8)
+#define PRC_PCI_DP_RD_Rn                       vBIT(0xFF, 8, 8)
+#define PRC_PCI_AB_WR_Rn                       vBIT(0xFF, 16, 8)
+#define PRC_PCI_DP_WR_Rn                       vBIT(0xFF, 24, 8)
+#define PRC_PCI_AB_F_WR_Rn                     vBIT(0xFF, 32, 8)
+#define PRC_PCI_DP_F_WR_Rn                     vBIT(0xFF, 40, 8)
        u64 prc_pcix_err_mask;
        u64 prc_pcix_err_alarm;
 
        u64 rpa_err_reg;
-#define RPA_ECC_SG_ERR                 s2BIT(7)
-#define RPA_ECC_DB_ERR                 s2BIT(15)
-#define RPA_FLUSH_REQUEST              s2BIT(22)
-#define RPA_SM_ERR_ALARM               s2BIT(23)
-#define RPA_CREDIT_ERR                 s2BIT(31)
+#define RPA_ECC_SG_ERR                         S2BIT(7)
+#define RPA_ECC_DB_ERR                         S2BIT(15)
+#define RPA_FLUSH_REQUEST                      S2BIT(22)
+#define RPA_SM_ERR_ALARM                       S2BIT(23)
+#define RPA_CREDIT_ERR                         S2BIT(31)
        u64 rpa_err_mask;
        u64 rpa_err_alarm;
 
        u64 rti_err_reg;
-#define RTI_ECC_SG_ERR                 s2BIT(7)
-#define RTI_ECC_DB_ERR                 s2BIT(15)
-#define RTI_SM_ERR_ALARM               s2BIT(23)
+#define RTI_ECC_SG_ERR                         S2BIT(7)
+#define RTI_ECC_DB_ERR                         S2BIT(15)
+#define RTI_SM_ERR_ALARM                       S2BIT(23)
        u64 rti_err_mask;
        u64 rti_err_alarm;
 
@@ -537,23 +543,23 @@ struct XENA_dev_config {
 
 /* DMA arbiter */
        u64 rx_queue_priority;
-#define RX_QUEUE_0_PRIORITY(val)       vBIT(val,5,3)
-#define RX_QUEUE_1_PRIORITY(val)       vBIT(val,13,3)
-#define RX_QUEUE_2_PRIORITY(val)       vBIT(val,21,3)
-#define RX_QUEUE_3_PRIORITY(val)       vBIT(val,29,3)
-#define RX_QUEUE_4_PRIORITY(val)       vBIT(val,37,3)
-#define RX_QUEUE_5_PRIORITY(val)       vBIT(val,45,3)
-#define RX_QUEUE_6_PRIORITY(val)       vBIT(val,53,3)
-#define RX_QUEUE_7_PRIORITY(val)       vBIT(val,61,3)
-
-#define RX_QUEUE_PRI_0                 0       /* highest */
-#define RX_QUEUE_PRI_1                 1
-#define RX_QUEUE_PRI_2                 2
-#define RX_QUEUE_PRI_3                 3
-#define RX_QUEUE_PRI_4                 4
-#define RX_QUEUE_PRI_5                 5
-#define RX_QUEUE_PRI_6                 6
-#define RX_QUEUE_PRI_7                 7       /* lowest */
+#define RX_QUEUE_0_PRIORITY(val)               vBIT(val, 5, 3)
+#define RX_QUEUE_1_PRIORITY(val)               vBIT(val, 13, 3)
+#define RX_QUEUE_2_PRIORITY(val)               vBIT(val, 21, 3)
+#define RX_QUEUE_3_PRIORITY(val)               vBIT(val, 29, 3)
+#define RX_QUEUE_4_PRIORITY(val)               vBIT(val, 37, 3)
+#define RX_QUEUE_5_PRIORITY(val)               vBIT(val, 45, 3)
+#define RX_QUEUE_6_PRIORITY(val)               vBIT(val, 53, 3)
+#define RX_QUEUE_7_PRIORITY(val)               vBIT(val, 61, 3)
+
+#define RX_QUEUE_PRI_0                         0       /* highest */
+#define RX_QUEUE_PRI_1                         1
+#define RX_QUEUE_PRI_2                         2
+#define RX_QUEUE_PRI_3                         3
+#define RX_QUEUE_PRI_4                         4
+#define RX_QUEUE_PRI_5                         5
+#define RX_QUEUE_PRI_6                         6
+#define RX_QUEUE_PRI_7                         7       /* lowest */
 
        u64 rx_w_round_robin_0;
        u64 rx_w_round_robin_1;
@@ -562,71 +568,74 @@ struct XENA_dev_config {
        u64 rx_w_round_robin_4;
 
        /* Per-ring controller regs */
-#define RX_MAX_RINGS                8
+#define RX_MAX_RINGS                           8
 #if 0
-#define RX_MAX_RINGS_SZ             0xFFFF     /* 65536 */
-#define RX_MIN_RINGS_SZ             0x3F       /* 63 */
+#define RX_MAX_RINGS_SZ                                0xFFFF  /* 65536 */
+#define RX_MIN_RINGS_SZ                                0x3F    /* 63 */
 #endif
        u64 prc_rxd0_n[RX_MAX_RINGS];
        u64 prc_ctrl_n[RX_MAX_RINGS];
-#define PRC_CTRL_RC_ENABLED                    s2BIT(7)
-#define PRC_CTRL_RING_MODE                     (s2BIT(14)|s2BIT(15))
-#define PRC_CTRL_RING_MODE_1                   vBIT(0,14,2)
-#define PRC_CTRL_RING_MODE_3                   vBIT(1,14,2)
-#define PRC_CTRL_RING_MODE_5                   vBIT(2,14,2)
-#define PRC_CTRL_RING_MODE_x                   vBIT(3,14,2)
-#define PRC_CTRL_NO_SNOOP                      (s2BIT(22)|s2BIT(23))
-#define PRC_CTRL_NO_SNOOP_DESC                 s2BIT(22)
-#define PRC_CTRL_NO_SNOOP_BUFF                 s2BIT(23)
-#define PRC_CTRL_BIMODAL_INTERRUPT             s2BIT(37)
-#define PRC_CTRL_GROUP_READS                   s2BIT(38)
-#define PRC_CTRL_RXD_BACKOFF_INTERVAL(val)     vBIT(val,40,24)
+#define PRC_CTRL_RC_ENABLED                    S2BIT(7)
+#define PRC_CTRL_RING_MODE                     (S2BIT(14)|S2BIT(15))
+#define PRC_CTRL_RING_MODE_1                   vBIT(0, 14, 2)
+#define PRC_CTRL_RING_MODE_3                   vBIT(1, 14, 2)
+#define PRC_CTRL_RING_MODE_5                   vBIT(2, 14, 2)
+#define PRC_CTRL_RING_MODE_x                   vBIT(3, 14, 2)
+#define PRC_CTRL_NO_SNOOP                      (S2BIT(22)|S2BIT(23))
+#define PRC_CTRL_NO_SNOOP_DESC                 S2BIT(22)
+#define PRC_CTRL_NO_SNOOP_BUFF                 S2BIT(23)
+#define PRC_CTRL_RTH_DISABLE                   S2BIT(31)
+#define PRC_CTRL_BIMODAL_INTERRUPT             S2BIT(37)
+#define PRC_CTRL_GROUP_READS                   S2BIT(38)
+#define PRC_CTRL_RXD_BACKOFF_INTERVAL(val)     vBIT(val, 40, 24)
 
        u64 prc_alarm_action;
-#define PRC_ALARM_ACTION_RR_R0_STOP            s2BIT(3)
-#define PRC_ALARM_ACTION_RW_R0_STOP            s2BIT(7)
-#define PRC_ALARM_ACTION_RR_R1_STOP            s2BIT(11)
-#define PRC_ALARM_ACTION_RW_R1_STOP            s2BIT(15)
-#define PRC_ALARM_ACTION_RR_R2_STOP            s2BIT(19)
-#define PRC_ALARM_ACTION_RW_R2_STOP            s2BIT(23)
-#define PRC_ALARM_ACTION_RR_R3_STOP            s2BIT(27)
-#define PRC_ALARM_ACTION_RW_R3_STOP            s2BIT(31)
-#define PRC_ALARM_ACTION_RR_R4_STOP            s2BIT(35)
-#define PRC_ALARM_ACTION_RW_R4_STOP            s2BIT(39)
-#define PRC_ALARM_ACTION_RR_R5_STOP            s2BIT(43)
-#define PRC_ALARM_ACTION_RW_R5_STOP            s2BIT(47)
-#define PRC_ALARM_ACTION_RR_R6_STOP            s2BIT(51)
-#define PRC_ALARM_ACTION_RW_R6_STOP            s2BIT(55)
-#define PRC_ALARM_ACTION_RR_R7_STOP            s2BIT(59)
-#define PRC_ALARM_ACTION_RW_R7_STOP            s2BIT(63)
+#define PRC_ALARM_ACTION_RR_R0_STOP            S2BIT(3)
+#define PRC_ALARM_ACTION_RW_R0_STOP            S2BIT(7)
+#define PRC_ALARM_ACTION_RR_R1_STOP            S2BIT(11)
+#define PRC_ALARM_ACTION_RW_R1_STOP            S2BIT(15)
+#define PRC_ALARM_ACTION_RR_R2_STOP            S2BIT(19)
+#define PRC_ALARM_ACTION_RW_R2_STOP            S2BIT(23)
+#define PRC_ALARM_ACTION_RR_R3_STOP            S2BIT(27)
+#define PRC_ALARM_ACTION_RW_R3_STOP            S2BIT(31)
+#define PRC_ALARM_ACTION_RR_R4_STOP            S2BIT(35)
+#define PRC_ALARM_ACTION_RW_R4_STOP            S2BIT(39)
+#define PRC_ALARM_ACTION_RR_R5_STOP            S2BIT(43)
+#define PRC_ALARM_ACTION_RW_R5_STOP            S2BIT(47)
+#define PRC_ALARM_ACTION_RR_R6_STOP            S2BIT(51)
+#define PRC_ALARM_ACTION_RW_R6_STOP            S2BIT(55)
+#define PRC_ALARM_ACTION_RR_R7_STOP            S2BIT(59)
+#define PRC_ALARM_ACTION_RW_R7_STOP            S2BIT(63)
 
 /* Receive traffic interrupts */
        u64 rti_command_mem;
-#define RTI_CMD_MEM_WE                          s2BIT(7)
-#define RTI_CMD_MEM_STROBE                      s2BIT(15)
-#define RTI_CMD_MEM_STROBE_NEW_CMD              s2BIT(15)
-#define RTI_CMD_MEM_STROBE_CMD_BEING_EXECUTED   s2BIT(15)
-#define RTI_CMD_MEM_OFFSET(n)                   vBIT(n,29,3)
+#define RTI_CMD_MEM_WE                         S2BIT(7)
+#define RTI_CMD_MEM_STROBE                     S2BIT(15)
+#define RTI_CMD_MEM_STROBE_NEW_CMD             S2BIT(15)
+#define RTI_CMD_MEM_STROBE_CMD_BEING_EXECUTED  S2BIT(15)
+#define RTI_CMD_MEM_OFFSET(n)                  vBIT(n, 29, 3)
 
        u64 rti_data1_mem;
-#define RTI_DATA1_MEM_RX_TIMER_VAL(n)      vBIT(n,3,29)
-#define RTI_DATA1_MEM_RX_TIMER_AC_EN       s2BIT(38)
-#define RTI_DATA1_MEM_RX_TIMER_CI_EN       s2BIT(39)
-#define RTI_DATA1_MEM_RX_URNG_A(n)         vBIT(n,41,7)
-#define RTI_DATA1_MEM_RX_URNG_B(n)         vBIT(n,49,7)
-#define RTI_DATA1_MEM_RX_URNG_C(n)         vBIT(n,57,7)
+#define RTI_DATA1_MEM_RX_TIMER_VAL(n)          vBIT(n, 3, 29)
+#define RTI_DATA1_MEM_RX_TIMER_AC_EN           S2BIT(38)
+#define RTI_DATA1_MEM_RX_TIMER_CI_EN           S2BIT(39)
+#define RTI_DATA1_MEM_RX_URNG_A(n)             vBIT(n, 41, 7)
+#define RTI_DATA1_MEM_RX_URNG_B(n)             vBIT(n, 49, 7)
+#define RTI_DATA1_MEM_RX_URNG_C(n)             vBIT(n, 57, 7)
 
        u64 rti_data2_mem;
-#define RTI_DATA2_MEM_RX_UFC_A(n)          vBIT(n,0,16)
-#define RTI_DATA2_MEM_RX_UFC_B(n)          vBIT(n,16,16)
-#define RTI_DATA2_MEM_RX_UFC_C(n)          vBIT(n,32,16)
-#define RTI_DATA2_MEM_RX_UFC_D(n)          vBIT(n,48,16)
+#define RTI_DATA2_MEM_RX_UFC_A(n)              vBIT(n, 0, 16)
+#define RTI_DATA2_MEM_RX_UFC_B(n)              vBIT(n, 16, 16)
+#define RTI_DATA2_MEM_RX_UFC_C(n)              vBIT(n, 32, 16)
+#define RTI_DATA2_MEM_RX_UFC_D(n)              vBIT(n, 48, 16)
 
        u64 rx_pa_cfg;
-#define RX_PA_CFG_IGNORE_FRM_ERR           s2BIT(1)
-#define RX_PA_CFG_IGNORE_SNAP_OUI          s2BIT(2)
-#define RX_PA_CFG_IGNORE_LLC_CTRL          s2BIT(3)
-#define RX_PA_CFG_IGNORE_L2_ERR            s2BIT(6)
+#define RX_PA_CFG_IGNORE_FRM_ERR               S2BIT(1)
+#define RX_PA_CFG_IGNORE_SNAP_OUI              S2BIT(2)
+#define RX_PA_CFG_IGNORE_LLC_CTRL              S2BIT(3)
+#define RX_PA_CFG_IGNORE_L2_ERR                        S2BIT(6)
+#define RX_PA_CFG_STRIP_VLAN_TAG               S2BIT(15)
+#define RX_PA_CFG_UDP_ZERO_CS_EN               S2BIT(31)
 
        u64 unused_11_1;
 
@@ -642,130 +651,132 @@ struct XENA_dev_config {
 /* Media Access Controller Register */
        u64 mac_int_status;
        u64 mac_int_mask;
-#define MAC_INT_STATUS_TMAC_INT            s2BIT(0)
-#define MAC_INT_STATUS_RMAC_INT            s2BIT(1)
+#define MAC_INT_STATUS_TMAC_INT                        S2BIT(0)
+#define MAC_INT_STATUS_RMAC_INT                        S2BIT(1)
 
        u64 mac_tmac_err_reg;
-#define TMAC_ECC_SG_ERR                                s2BIT(7)
-#define TMAC_ECC_DB_ERR                                s2BIT(15)
-#define TMAC_TX_BUF_OVRN                       s2BIT(23)
-#define TMAC_TX_CRI_ERR                                s2BIT(31)
-#define TMAC_TX_SM_ERR                         s2BIT(39)
-#define TMAC_DESC_ECC_SG_ERR                   s2BIT(47)
-#define TMAC_DESC_ECC_DB_ERR                   s2BIT(55)
-
+#define TMAC_ECC_SG_ERR                                S2BIT(7)
+#define TMAC_ECC_DB_ERR                                S2BIT(15)
+#define TMAC_TX_BUF_OVRN                       S2BIT(23)
+#define TMAC_TX_CRI_ERR                                S2BIT(31)
+#define TMAC_TX_SM_ERR                         S2BIT(39)
+#define TMAC_DESC_ECC_SG_ERR                   S2BIT(47)
+#define TMAC_DESC_ECC_DB_ERR                   S2BIT(55)
        u64 mac_tmac_err_mask;
        u64 mac_tmac_err_alarm;
 
        u64 mac_rmac_err_reg;
-#define RMAC_RX_BUFF_OVRN                      s2BIT(0)
-#define RMAC_FRM_RCVD_INT                      s2BIT(1)
-#define RMAC_UNUSED_INT                                s2BIT(2)
-#define RMAC_RTS_PNUM_ECC_SG_ERR               s2BIT(5)
-#define RMAC_RTS_DS_ECC_SG_ERR                 s2BIT(6)
-#define RMAC_RD_BUF_ECC_SG_ERR                 s2BIT(7)
-#define RMAC_RTH_MAP_ECC_SG_ERR                        s2BIT(8)
-#define RMAC_RTH_SPDM_ECC_SG_ERR               s2BIT(9)
-#define RMAC_RTS_VID_ECC_SG_ERR                        s2BIT(10)
-#define RMAC_DA_SHADOW_ECC_SG_ERR              s2BIT(11)
-#define RMAC_RTS_PNUM_ECC_DB_ERR               s2BIT(13)
-#define RMAC_RTS_DS_ECC_DB_ERR                 s2BIT(14)
-#define RMAC_RD_BUF_ECC_DB_ERR                 s2BIT(15)
-#define RMAC_RTH_MAP_ECC_DB_ERR                        s2BIT(16)
-#define RMAC_RTH_SPDM_ECC_DB_ERR               s2BIT(17)
-#define RMAC_RTS_VID_ECC_DB_ERR                        s2BIT(18)
-#define RMAC_DA_SHADOW_ECC_DB_ERR              s2BIT(19)
-#define RMAC_LINK_STATE_CHANGE_INT             s2BIT(31)
-#define RMAC_RX_SM_ERR                         s2BIT(39)
-#define RMAC_SINGLE_ECC_ERR                    (s2BIT(5) | s2BIT(6) | s2BIT(7) |\
-                                               s2BIT(8)  | s2BIT(9) | s2BIT(10)|\
-                                               s2BIT(11))
-#define RMAC_DOUBLE_ECC_ERR                    (s2BIT(13) | s2BIT(14) | s2BIT(15) |\
-                                               s2BIT(16)  | s2BIT(17) | s2BIT(18)|\
-                                               s2BIT(19))
+#define RMAC_RX_BUFF_OVRN                      S2BIT(0)
+#define RMAC_FRM_RCVD_INT                      S2BIT(1)
+#define RMAC_UNUSED_INT                                S2BIT(2)
+#define RMAC_RTS_PNUM_ECC_SG_ERR               S2BIT(5)
+#define RMAC_RTS_DS_ECC_SG_ERR                 S2BIT(6)
+#define RMAC_RD_BUF_ECC_SG_ERR                 S2BIT(7)
+#define RMAC_RTH_MAP_ECC_SG_ERR                        S2BIT(8)
+#define RMAC_RTH_SPDM_ECC_SG_ERR               S2BIT(9)
+#define RMAC_RTS_VID_ECC_SG_ERR                        S2BIT(10)
+#define RMAC_DA_SHADOW_ECC_SG_ERR              S2BIT(11)
+#define RMAC_RTS_PNUM_ECC_DB_ERR               S2BIT(13)
+#define RMAC_RTS_DS_ECC_DB_ERR                 S2BIT(14)
+#define RMAC_RD_BUF_ECC_DB_ERR                 S2BIT(15)
+#define RMAC_RTH_MAP_ECC_DB_ERR                        S2BIT(16)
+#define RMAC_RTH_SPDM_ECC_DB_ERR               S2BIT(17)
+#define RMAC_RTS_VID_ECC_DB_ERR                        S2BIT(18)
+#define RMAC_DA_SHADOW_ECC_DB_ERR              S2BIT(19)
+#define RMAC_LINK_STATE_CHANGE_INT             S2BIT(31)
+#define RMAC_RX_SM_ERR                         S2BIT(39)
+#define RMAC_SINGLE_ECC_ERR                    (S2BIT(5) | S2BIT(6) | \
+                                               S2BIT(7) | S2BIT(8) | \
+                                               S2BIT(9) | S2BIT(10) | \
+                                               S2BIT(11))
+#define RMAC_DOUBLE_ECC_ERR                    (S2BIT(13) | S2BIT(14) | \
+                                               S2BIT(15) | S2BIT(16) | \
+                                               S2BIT(17)  | S2BIT(18) | \
+                                               S2BIT(19))
+
        u64 mac_rmac_err_mask;
        u64 mac_rmac_err_alarm;
 
        u8 unused14[0x100 - 0x40];
 
        u64 mac_cfg;
-#define MAC_CFG_TMAC_ENABLE             s2BIT(0)
-#define MAC_CFG_RMAC_ENABLE             s2BIT(1)
-#define MAC_CFG_LAN_NOT_WAN             s2BIT(2)
-#define MAC_CFG_TMAC_LOOPBACK           s2BIT(3)
-#define MAC_CFG_TMAC_APPEND_PAD         s2BIT(4)
-#define MAC_CFG_RMAC_STRIP_FCS          s2BIT(5)
-#define MAC_CFG_RMAC_STRIP_PAD          s2BIT(6)
-#define MAC_CFG_RMAC_PROM_ENABLE        s2BIT(7)
-#define MAC_RMAC_DISCARD_PFRM           s2BIT(8)
-#define MAC_RMAC_BCAST_ENABLE           s2BIT(9)
-#define MAC_RMAC_ALL_ADDR_ENABLE        s2BIT(10)
-#define MAC_RMAC_INVLD_IPG_THR(val)     vBIT(val,16,8)
+#define MAC_CFG_TMAC_ENABLE                    S2BIT(0)
+#define MAC_CFG_RMAC_ENABLE                    S2BIT(1)
+#define MAC_CFG_LAN_NOT_WAN                    S2BIT(2)
+#define MAC_CFG_TMAC_LOOPBACK                  S2BIT(3)
+#define MAC_CFG_TMAC_APPEND_PAD                        S2BIT(4)
+#define MAC_CFG_RMAC_STRIP_FCS                 S2BIT(5)
+#define MAC_CFG_RMAC_STRIP_PAD                 S2BIT(6)
+#define MAC_CFG_RMAC_PROM_ENABLE               S2BIT(7)
+#define MAC_RMAC_DISCARD_PFRM                  S2BIT(8)
+#define MAC_RMAC_BCAST_ENABLE                  S2BIT(9)
+#define MAC_RMAC_ALL_ADDR_ENABLE               S2BIT(10)
+#define MAC_RMAC_INVLD_IPG_THR(val)            vBIT(val, 16, 8)
 
        u64 tmac_avg_ipg;
-#define TMAC_AVG_IPG(val)           vBIT(val,0,8)
+#define TMAC_AVG_IPG(val)                      vBIT(val, 0, 8)
 
        u64 rmac_max_pyld_len;
-#define RMAC_MAX_PYLD_LEN(val)      vBIT(val,2,14)
-#define RMAC_MAX_PYLD_LEN_DEF       vBIT(1500,2,14)
-#define RMAC_MAX_PYLD_LEN_JUMBO_DEF vBIT(9600,2,14)
+#define RMAC_MAX_PYLD_LEN(val)                 vBIT(val, 2, 14)
+#define RMAC_MAX_PYLD_LEN_DEF                  vBIT(1500, 2, 14)
+#define RMAC_MAX_PYLD_LEN_JUMBO_DEF            vBIT(9600, 2, 14)
 
        u64 rmac_err_cfg;
-#define RMAC_ERR_FCS                    s2BIT(0)
-#define RMAC_ERR_FCS_ACCEPT             s2BIT(1)
-#define RMAC_ERR_TOO_LONG               s2BIT(1)
-#define RMAC_ERR_TOO_LONG_ACCEPT        s2BIT(1)
-#define RMAC_ERR_RUNT                   s2BIT(2)
-#define RMAC_ERR_RUNT_ACCEPT            s2BIT(2)
-#define RMAC_ERR_LEN_MISMATCH           s2BIT(3)
-#define RMAC_ERR_LEN_MISMATCH_ACCEPT    s2BIT(3)
+#define RMAC_ERR_FCS                           S2BIT(0)
+#define RMAC_ERR_FCS_ACCEPT                    S2BIT(1)
+#define RMAC_ERR_TOO_LONG                      S2BIT(1)
+#define RMAC_ERR_TOO_LONG_ACCEPT               S2BIT(1)
+#define RMAC_ERR_RUNT                          S2BIT(2)
+#define RMAC_ERR_RUNT_ACCEPT                   S2BIT(2)
+#define RMAC_ERR_LEN_MISMATCH                  S2BIT(3)
+#define RMAC_ERR_LEN_MISMATCH_ACCEPT           S2BIT(3)
 
        u64 rmac_cfg_key;
-#define RMAC_CFG_KEY(val)               vBIT(val,0,16)
+#define RMAC_CFG_KEY(val)                      vBIT(val, 0, 16)
 
-#define S2IO_MAC_ADDR_START_OFFSET     0
+#define S2IO_MAC_ADDR_START_OFFSET             0
 
-#define S2IO_XENA_MAX_MC_ADDRESSES     64      /* multicast addresses */
-#define S2IO_HERC_MAX_MC_ADDRESSES     256
+#define S2IO_XENA_MAX_MC_ADDRESSES             64      /*multicast addresses*/
+#define S2IO_HERC_MAX_MC_ADDRESSES             256
 
-#define S2IO_XENA_MAX_MAC_ADDRESSES    16
-#define S2IO_HERC_MAX_MAC_ADDRESSES    64
+#define S2IO_XENA_MAX_MAC_ADDRESSES            16
+#define S2IO_HERC_MAX_MAC_ADDRESSES            64
 
-#define S2IO_XENA_MC_ADDR_START_OFFSET 16
-#define S2IO_HERC_MC_ADDR_START_OFFSET 64
+#define S2IO_XENA_MC_ADDR_START_OFFSET         16
+#define S2IO_HERC_MC_ADDR_START_OFFSET         64
 
        u64 rmac_addr_cmd_mem;
-#define RMAC_ADDR_CMD_MEM_WE                    s2BIT(7)
-#define RMAC_ADDR_CMD_MEM_RD                    0
-#define RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD        s2BIT(15)
-#define RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING  s2BIT(15)
-#define RMAC_ADDR_CMD_MEM_OFFSET(n)             vBIT(n,26,6)
+#define RMAC_ADDR_CMD_MEM_WE                   S2BIT(7)
+#define RMAC_ADDR_CMD_MEM_RD                   0
+#define RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD       S2BIT(15)
+#define RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING S2BIT(15)
+#define RMAC_ADDR_CMD_MEM_OFFSET(n)            vBIT(n, 26, 6)
 
        u64 rmac_addr_data0_mem;
-#define RMAC_ADDR_DATA0_MEM_ADDR(n)    vBIT(n,0,48)
-#define RMAC_ADDR_DATA0_MEM_USER       s2BIT(48)
+#define RMAC_ADDR_DATA0_MEM_ADDR(n)            vBIT(n, 0, 48)
+#define RMAC_ADDR_DATA0_MEM_USER               S2BIT(48)
 
        u64 rmac_addr_data1_mem;
-#define RMAC_ADDR_DATA1_MEM_MASK(n)    vBIT(n,0,48)
+#define RMAC_ADDR_DATA1_MEM_MASK(n)            vBIT(n, 0, 48)
 
        u8 unused15[0x8];
 
 /*
-        u64 rmac_addr_cfg;
-#define RMAC_ADDR_UCASTn_EN(n)     mBIT(0)_n(n)
-#define RMAC_ADDR_MCASTn_EN(n)     mBIT(0)_n(n)
-#define RMAC_ADDR_BCAST_EN         vBIT(0)_48
-#define RMAC_ADDR_ALL_ADDR_EN      vBIT(0)_49
+       u64 rmac_addr_cfg;
+#define RMAC_ADDR_UCASTn_EN(n)                 mS2BIT(0)_n(n)
+#define RMAC_ADDR_MCASTn_EN(n)                 mS2BIT(0)_n(n)
+#define RMAC_ADDR_BCAST_EN                     vBIT(0)_48
+#define RMAC_ADDR_ALL_ADDR_EN                  vBIT(0)_49
 */
        u64 tmac_ipg_cfg;
 
        u64 rmac_pause_cfg;
-#define RMAC_PAUSE_GEN             s2BIT(0)
-#define RMAC_PAUSE_GEN_ENABLE      s2BIT(0)
-#define RMAC_PAUSE_RX              s2BIT(1)
-#define RMAC_PAUSE_RX_ENABLE       s2BIT(1)
-#define RMAC_PAUSE_HG_PTIME_DEF    vBIT(0xFFFF,16,16)
-#define RMAC_PAUSE_HG_PTIME(val)    vBIT(val,16,16)
+#define RMAC_PAUSE_GEN                         S2BIT(0)
+#define RMAC_PAUSE_GEN_ENABLE                  S2BIT(0)
+#define RMAC_PAUSE_RX                          S2BIT(1)
+#define RMAC_PAUSE_RX_ENABLE                   S2BIT(1)
+#define RMAC_PAUSE_HG_PTIME_DEF                        vBIT(0xFFFF, 16, 16)
+#define RMAC_PAUSE_HG_PTIME(val)               vBIT(val, 16, 16)
 
        u64 rmac_red_cfg;
 
@@ -773,80 +784,138 @@ struct XENA_dev_config {
        u64 rmac_red_rate_q4q7;
 
        u64 mac_link_util;
-#define MAC_TX_LINK_UTIL           vBIT(0xFE,1,7)
-#define MAC_TX_LINK_UTIL_DISABLE   vBIT(0xF, 8,4)
-#define MAC_TX_LINK_UTIL_VAL( n )  vBIT(n,8,4)
-#define MAC_RX_LINK_UTIL           vBIT(0xFE,33,7)
-#define MAC_RX_LINK_UTIL_DISABLE   vBIT(0xF,40,4)
-#define MAC_RX_LINK_UTIL_VAL( n )  vBIT(n,40,4)
+#define MAC_TX_LINK_UTIL                       vBIT(0xFE, 1, 7)
+#define MAC_TX_LINK_UTIL_DISABLE               vBIT(0xF, 8, 4)
+#define MAC_TX_LINK_UTIL_VAL(n)                        vBIT(n, 8, 4)
+#define MAC_RX_LINK_UTIL                       vBIT(0xFE, 33, 7)
+#define MAC_RX_LINK_UTIL_DISABLE               vBIT(0xF, 40, 4)
+#define MAC_RX_LINK_UTIL_VAL(n)                        vBIT(n, 40, 4)
 
-#define MAC_LINK_UTIL_DISABLE      MAC_TX_LINK_UTIL_DISABLE | \
-                                   MAC_RX_LINK_UTIL_DISABLE
+#define MAC_LINK_UTIL_DISABLE                  (MAC_TX_LINK_UTIL_DISABLE | \
+                                               MAC_RX_LINK_UTIL_DISABLE)
 
        u64 rmac_invalid_ipg;
 
 /* rx traffic steering */
-#define        MAC_RTS_FRM_LEN_SET(len)        vBIT(len,2,14)
+#define        MAC_RTS_FRM_LEN_SET(len)                vBIT(len, 2, 14)
        u64 rts_frm_len_n[8];
 
        u64 rts_qos_steering;
 
-#define MAX_DIX_MAP                         4
+#define MAX_DIX_MAP                            4
        u64 rts_dix_map_n[MAX_DIX_MAP];
-#define RTS_DIX_MAP_ETYPE(val)             vBIT(val,0,16)
-#define RTS_DIX_MAP_SCW(val)               s2BIT(val,21)
+#define RTS_DIX_MAP_ETYPE(val)                 vBIT(val, 0, 16)
+#define RTS_DIX_MAP_SCW(val)                   S2BIT(val, 21)
 
        u64 rts_q_alternates;
        u64 rts_default_q;
 
        u64 rts_ctrl;
-#define RTS_CTRL_IGNORE_SNAP_OUI           s2BIT(2)
-#define RTS_CTRL_IGNORE_LLC_CTRL           s2BIT(3)
+#define RTS_CTRL_IGNORE_SNAP_OUI               S2BIT(2)
+#define RTS_CTRL_IGNORE_LLC_CTRL               S2BIT(3)
+#define        RTS_CTRL_ENHANCED                       S2BIT(7)
 
        u64 rts_pn_cam_ctrl;
-#define RTS_PN_CAM_CTRL_WE                 s2BIT(7)
-#define RTS_PN_CAM_CTRL_STROBE_NEW_CMD     s2BIT(15)
-#define RTS_PN_CAM_CTRL_STROBE_BEING_EXECUTED   s2BIT(15)
-#define RTS_PN_CAM_CTRL_OFFSET(n)          vBIT(n,24,8)
+#define RTS_PN_CAM_CTRL_WE                     S2BIT(7)
+#define RTS_PN_CAM_CTRL_STROBE_NEW_CMD         S2BIT(15)
+#define RTS_PN_CAM_CTRL_STROBE_BEING_EXECUTED  S2BIT(15)
+#define RTS_PN_CAM_CTRL_OFFSET(n)              vBIT(n, 24, 8)
        u64 rts_pn_cam_data;
-#define RTS_PN_CAM_DATA_TCP_SELECT         s2BIT(7)
-#define RTS_PN_CAM_DATA_PORT(val)          vBIT(val,8,16)
-#define RTS_PN_CAM_DATA_SCW(val)           vBIT(val,24,8)
+#define RTS_PN_CAM_DATA_TCP_SELECT             S2BIT(7)
+#define RTS_PN_CAM_DATA_PORT(val)              vBIT(val, 8, 16)
+#define RTS_PN_CAM_DATA_SCW(val)               vBIT(val, 24, 8)
 
        u64 rts_ds_mem_ctrl;
-#define RTS_DS_MEM_CTRL_WE                 s2BIT(7)
-#define RTS_DS_MEM_CTRL_STROBE_NEW_CMD     s2BIT(15)
-#define RTS_DS_MEM_CTRL_STROBE_CMD_BEING_EXECUTED   s2BIT(15)
-#define RTS_DS_MEM_CTRL_OFFSET(n)          vBIT(n,26,6)
+#define RTS_DS_MEM_CTRL_WE                     S2BIT(7)
+#define RTS_DS_MEM_CTRL_STROBE_NEW_CMD         S2BIT(15)
+#define RTS_DS_MEM_CTRL_STROBE_CMD_BEING_EXECUTED S2BIT(15)
+#define RTS_DS_MEM_CTRL_OFFSET(n)              vBIT(n, 26, 6)
        u64 rts_ds_mem_data;
-#define RTS_DS_MEM_DATA(n)                 vBIT(n,0,8)
-
-       u8 unused16[0x700 - 0x220];
+#define RTS_DS_MEM_DATA(n)                     vBIT(n, 0, 8)
+
+       u8 unused15_1[0x308 - 0x220];
+
+       u64 rts_vid_mem_ctrl;
+#define RTS_VID_MEM_CTRL_WE                    S2BIT(7)
+#define RTS_VID_MEM_CTRL_STROBE_NEW_CMD                S2BIT(15)
+#define RTS_VID_MEM_CTRL_STROBE_CMD_BEING_EXECUTED S2BIT(15)
+#define RTS_VID_MEM_CTRL_OFFSET(n)             vBIT(n, 20, 12)
+       u64 rts_vid_mem_data;
+#define RTS_VID_MEM_ENTRY_EN(n)                        vBIT(n, 3, 1)
+#define RTS_VID_MEM_DATA(n)                    vBIT(n, 5, 3)
+
+       u64 rts_p0_p3_map;
+       u64 rts_p4_p7_map;
+       u8 unused15_2[0x380 - 0x328];
+       u64 rts_rth_cfg;
+#define RTS_RTH_EN                             S2BIT(3)
+#define RTS_RTH_BUCKET_SIZE(n)                 vBIT(n, 4, 4)
+#define RTS_RTH_TCP_IPV4_EN                    S2BIT(15)
+#define RTS_RTH_UDP_IPV4_EN                    S2BIT(19)
+#define RTS_RTH_IPV4_EN                                S2BIT(23)
+#define RTS_RTH_TCP_IPV6_EN                    S2BIT(27)
+#define RTS_RTH_UDP_IPV6_EN                    S2BIT(31)
+#define RTS_RTH_IPV6_EN                                S2BIT(35)
+#define RTS_RTH_TCP_IPV6_EX_EN                 S2BIT(39)
+#define RTS_RTH_UDP_IPV6_EX_EN                 S2BIT(43)
+#define RTS_RTH_IPV6_EX_EN                     S2BIT(47)
+
+       u64 rts_rth_map_mem_ctrl;
+#define RTS_RTH_MAP_MEM_CTRL_WE                        S2BIT(7)
+#define RTS_RTH_MAP_MEM_CTRL_STROBE            S2BIT(15)
+#define RTS_RTH_MAP_MEM_CTRL_OFFSET(n)         vBIT(n, 24, 8)
+
+       u64 rts_rth_map_mem_data;
+#define RTS_RTH_MAP_MEM_DATA_ENTRY_EN          S2BIT(3)
+#define RTS_RTH_MAP_MEM_DATA_(n)               vBIT(n, 5, 3)
+
+       u64 rts_rth_spdm_mem_ctrl;
+#define RTS_RTH_SPDM_MEM_CTRL_STROBE           S2BIT(15)
+#define RTS_RTH_SPDM_MEM_CTRL_LINE_SEL(n)      vBIT(n, 21, 3)
+#define RTS_RTH_SPDM_MEM_CTRL_OFFSET(n)                vBIT(n, 24, 8)
+
+       u64 rts_rth_spdm_mem_data;
+
+       u64 rts_rth_jhash_cfg;
+#define RTS_RTH_JHASH_GOLDEN(n)                        vBIT(n, 0, 32)
+#define RTS_RTH_JHASH_INIT_VAL(n)              vBIT(n, 32, 32)
+
+       u64 rts_rth_hash_mask_n[5];
+#define RTS_RTH_HASH_MASK_IPV4_SA(mask)                vBIT(mask, 0, 32)
+#define RTS_RTH_HASH_MASK_IPV4_DA(mask)                vBIT(mask, 32, 32)
+
+       u64 rts_rth_hash_mask_5;
+#define RTS_RTH_HASH_MASK_L4_SP(mask)          vBIT(mask, 0, 16)
+#define RTS_RTH_HASH_MASK_L4_DP(mask)          vBIT(mask, 16, 16)
+
+       u8 unused16[0x700 - 0x3E0];
 
        u64 mac_debug_ctrl;
-#define MAC_DBG_ACTIVITY_VALUE            0x411040400000000ULL
+#define MAC_DBG_ACTIVITY_VALUE                 0x411040400000000ULL
 
        u8 unused17[0x2800 - 0x2708];
 
 /* memory controller registers */
        u64 mc_int_status;
-#define MC_INT_STATUS_MC_INT               s2BIT(0)
+#define MC_INT_STATUS_MC_INT                   S2BIT(0)
        u64 mc_int_mask;
-#define MC_INT_MASK_MC_INT                 s2BIT(0)
+#define MC_INT_MASK_MC_INT                     S2BIT(0)
 
        u64 mc_err_reg;
-#define MC_ERR_REG_ECC_DB_ERR_L            s2BIT(14)
-#define MC_ERR_REG_ECC_DB_ERR_U            s2BIT(15)
-#define MC_ERR_REG_MIRI_ECC_DB_ERR_0       s2BIT(18)
-#define MC_ERR_REG_MIRI_ECC_DB_ERR_1       s2BIT(20)
-#define MC_ERR_REG_MIRI_CRI_ERR_0          s2BIT(22)
-#define MC_ERR_REG_MIRI_CRI_ERR_1          s2BIT(23)
-#define MC_ERR_REG_SM_ERR                  s2BIT(31)
-#define MC_ERR_REG_ECC_ALL_SNG            (s2BIT(2) | s2BIT(3) | s2BIT(4) | s2BIT(5) |\
-                                       s2BIT(17) | s2BIT(19))
-#define MC_ERR_REG_ECC_ALL_DBL            (s2BIT(10) | s2BIT(11) | s2BIT(12) |\
-                                       s2BIT(13) | s2BIT(18) | s2BIT(20))
-#define PLL_LOCK_N                     s2BIT(39)
+#define MC_ERR_REG_ECC_DB_ERR_L                        S2BIT(14)
+#define MC_ERR_REG_ECC_DB_ERR_U                        S2BIT(15)
+#define MC_ERR_REG_MIRI_ECC_DB_ERR_0           S2BIT(18)
+#define MC_ERR_REG_MIRI_ECC_DB_ERR_1           S2BIT(20)
+#define MC_ERR_REG_MIRI_CRI_ERR_0              S2BIT(22)
+#define MC_ERR_REG_MIRI_CRI_ERR_1              S2BIT(23)
+#define MC_ERR_REG_SM_ERR                      S2BIT(31)
+#define MC_ERR_REG_ECC_ALL_SNG                 (S2BIT(2) | S2BIT(3) | \
+                                               S2BIT(4) | S2BIT(5) | \
+                                               S2BIT(17) | S2BIT(19))
+#define MC_ERR_REG_ECC_ALL_DBL                 (S2BIT(10) | S2BIT(11) | \
+                                               S2BIT(12) | S2BIT(13) | \
+                                               S2BIT(18) | S2BIT(20))
+#define PLL_LOCK_N                             S2BIT(39)
        u64 mc_err_mask;
        u64 mc_err_alarm;
 
@@ -854,18 +923,18 @@ struct XENA_dev_config {
 
 /* MC configuration */
        u64 rx_queue_cfg;
-#define RX_QUEUE_CFG_Q0_SZ(n)              vBIT(n,0,8)
-#define RX_QUEUE_CFG_Q1_SZ(n)              vBIT(n,8,8)
-#define RX_QUEUE_CFG_Q2_SZ(n)              vBIT(n,16,8)
-#define RX_QUEUE_CFG_Q3_SZ(n)              vBIT(n,24,8)
-#define RX_QUEUE_CFG_Q4_SZ(n)              vBIT(n,32,8)
-#define RX_QUEUE_CFG_Q5_SZ(n)              vBIT(n,40,8)
-#define RX_QUEUE_CFG_Q6_SZ(n)              vBIT(n,48,8)
-#define RX_QUEUE_CFG_Q7_SZ(n)              vBIT(n,56,8)
+#define RX_QUEUE_CFG_Q0_SZ(n)                  vBIT(n, 0, 8)
+#define RX_QUEUE_CFG_Q1_SZ(n)                  vBIT(n, 8, 8)
+#define RX_QUEUE_CFG_Q2_SZ(n)                  vBIT(n, 16, 8)
+#define RX_QUEUE_CFG_Q3_SZ(n)                  vBIT(n, 24, 8)
+#define RX_QUEUE_CFG_Q4_SZ(n)                  vBIT(n, 32, 8)
+#define RX_QUEUE_CFG_Q5_SZ(n)                  vBIT(n, 40, 8)
+#define RX_QUEUE_CFG_Q6_SZ(n)                  vBIT(n, 48, 8)
+#define RX_QUEUE_CFG_Q7_SZ(n)                  vBIT(n, 56, 8)
 
        u64 mc_rldram_mrs;
-#define        MC_RLDRAM_QUEUE_SIZE_ENABLE                     s2BIT(39)
-#define        MC_RLDRAM_MRS_ENABLE                            s2BIT(47)
+#define        MC_RLDRAM_QUEUE_SIZE_ENABLE             S2BIT(39)
+#define        MC_RLDRAM_MRS_ENABLE                    S2BIT(47)
 
        u64 mc_rldram_interleave;
 
@@ -878,11 +947,11 @@ struct XENA_dev_config {
        u64 mc_rldram_ref_per;
        u8 unused20[0x220 - 0x208];
        u64 mc_rldram_test_ctrl;
-#define MC_RLDRAM_TEST_MODE            s2BIT(47)
-#define MC_RLDRAM_TEST_WRITE   s2BIT(7)
-#define MC_RLDRAM_TEST_GO              s2BIT(15)
-#define MC_RLDRAM_TEST_DONE            s2BIT(23)
-#define MC_RLDRAM_TEST_PASS            s2BIT(31)
+#define MC_RLDRAM_TEST_MODE                    S2BIT(47)
+#define MC_RLDRAM_TEST_WRITE                   S2BIT(7)
+#define MC_RLDRAM_TEST_GO                      S2BIT(15)
+#define MC_RLDRAM_TEST_DONE                    S2BIT(23)
+#define MC_RLDRAM_TEST_PASS                    S2BIT(31)
 
        u8 unused21[0x240 - 0x228];
        u64 mc_rldram_test_add;
@@ -895,11 +964,18 @@ struct XENA_dev_config {
 
        u8 unused24_1[0x360 - 0x308];
        u64 mc_rldram_ctrl;
-#define        MC_RLDRAM_ENABLE_ODT            s2BIT(7)
+#define        MC_RLDRAM_ENABLE_ODT                    S2BIT(7)
+
+       u64 padd[0x1F];
+       u64 mc_rldram_test_add_bkg;
+       u64 padd2[0x33];
+       u64 mc_generation;
+       u64 res[3];
+       u64 mc_driver;
+       u64 res1[3];
 
-       u8 unused24_2[0x640 - 0x368];
        u64 mc_rldram_ref_per_herc;
-#define        MC_RLDRAM_SET_REF_PERIOD(val)   vBIT(val, 0, 16)
+#define        MC_RLDRAM_SET_REF_PERIOD(val)           vBIT(val, 0, 16)
 
        u8 unused24_3[0x660 - 0x648];
        u64 mc_rldram_mrs_herc;
@@ -913,24 +989,23 @@ struct XENA_dev_config {
        /* XGXS control registers */
 
        u64 xgxs_int_status;
-#define XGXS_INT_STATUS_TXGXS              s2BIT(0)
-#define XGXS_INT_STATUS_RXGXS              s2BIT(1)
+#define XGXS_INT_STATUS_TXGXS                  S2BIT(0)
+#define XGXS_INT_STATUS_RXGXS                  S2BIT(1)
+#define SPI_ERR_INT                            S2BIT(2)
        u64 xgxs_int_mask;
-#define XGXS_INT_MASK_TXGXS                s2BIT(0)
-#define XGXS_INT_MASK_RXGXS                s2BIT(1)
-
+#define XGXS_INT_MASK_TXGXS                    S2BIT(0)
+#define XGXS_INT_MASK_RXGXS                    S2BIT(1)
        u64 xgxs_txgxs_err_reg;
-#define TXGXS_ECC_SG_ERR               s2BIT(7)
-#define TXGXS_ECC_DB_ERR               s2BIT(15)
-#define TXGXS_ESTORE_UFLOW             s2BIT(31)
-#define TXGXS_TX_SM_ERR                        s2BIT(39)
-
+#define TXGXS_ECC_SG_ERR                       S2BIT(7)
+#define TXGXS_ECC_DB_ERR                       S2BIT(15)
+#define TXGXS_ESTORE_UFLOW                     S2BIT(31)
+#define TXGXS_TX_SM_ERR                                S2BIT(39)
        u64 xgxs_txgxs_err_mask;
        u64 xgxs_txgxs_err_alarm;
 
        u64 xgxs_rxgxs_err_reg;
-#define RXGXS_ESTORE_OFLOW             s2BIT(7)
-#define RXGXS_RX_SM_ERR                        s2BIT(39)
+#define RXGXS_ESTORE_OFLOW                     S2BIT(7)
+#define RXGXS_RX_SM_ERR                                S2BIT(39)
        u64 xgxs_rxgxs_err_mask;
        u64 xgxs_rxgxs_err_alarm;
 
@@ -943,21 +1018,20 @@ struct XENA_dev_config {
        u64 xgxs_efifo_cfg;     /* CHANGED */
        u64 rxgxs_ber_0;        /* CHANGED */
        u64 rxgxs_ber_1;        /* CHANGED */
-
        u64 spi_control;
-#define SPI_CONTROL_KEY(key)           vBIT(key,0,4)
-#define SPI_CONTROL_BYTECNT(cnt)       vBIT(cnt,29,3)
-#define SPI_CONTROL_CMD(cmd)           vBIT(cmd,32,8)
-#define SPI_CONTROL_ADDR(addr)         vBIT(addr,40,24)
-#define SPI_CONTROL_SEL1               s2BIT(4)
-#define SPI_CONTROL_REQ                        s2BIT(7)
-#define SPI_CONTROL_NACK               s2BIT(5)
-#define SPI_CONTROL_DONE               s2BIT(6)
+#define SPI_CONTROL_KEY(key)                   vBIT(key, 0, 4)
+#define SPI_CONTROL_BYTECNT(cnt)               vBIT(cnt, 29, 3)
+#define SPI_CONTROL_CMD(cmd)                   vBIT(cmd, 32, 8)
+#define SPI_CONTROL_ADDR(addr)                 vBIT(addr, 40, 24)
+#define SPI_CONTROL_SEL1                       S2BIT(4)
+#define SPI_CONTROL_REQ                                S2BIT(7)
+#define SPI_CONTROL_NACK                       S2BIT(5)
+#define SPI_CONTROL_DONE                       S2BIT(6)
        u64 spi_data;
-#define SPI_DATA_WRITE(data,len)       vBIT(data,0,len)
+#define SPI_DATA_WRITE(data, len)              vBIT(data, 0, len)
 };
 
-#define XENA_REG_SPACE sizeof(struct XENA_dev_config)
+#define XENA_REG_SPACE sizeof(struct XENA_dev_config)
 #define        XENA_EEPROM_SPACE (0x01 << 11)
 
 #endif                         /* _REGS_H */
index a2b073097e5ce3fcf3645ca8a93a0a0f7cb1da5e..35b9c183fb60c748fe318946b3d151da4ef05c66 100644 (file)
-/************************************************************************
- * s2io.c: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
- * Copyright(c) 2002-2007 Neterion Inc.
-
- * This software may be used and distributed according to the terms of
- * the GNU General Public License (GPL), incorporated herein by reference.
- * Drivers based on or derived from this code fall under the GPL and must
- * retain the authorship, copyright and license notice.  This file is not
- * a complete program and may only be used when the entire operating
- * system is licensed under the GPL.
- * See the file COPYING in this distribution for more information.
- *
- * Credits:
- * Jeff Garzik         : For pointing out the improper error condition
- *                       check in the s2io_xmit routine and also some
- *                       issues in the Tx watch dog function. Also for
- *                       patiently answering all those innumerable
- *                       questions regaring the 2.6 porting issues.
- * Stephen Hemminger   : Providing proper 2.6 porting mechanism for some
- *                       macros available only in 2.6 Kernel.
- * Francois Romieu     : For pointing out all code part that were
- *                       deprecated and also styling related comments.
- * Grant Grundler      : For helping me get rid of some Architecture
- *                       dependent code.
- * Christopher Hellwig : Some more 2.6 specific issues in the driver.
- *
- * The module loadable parameters that are supported by the driver and a brief
- * explaination of all the variables.
- *
- * rx_ring_num : This can be used to program the number of receive rings used
- * in the driver.
- * rx_ring_sz: This defines the number of receive blocks each ring can have.
- *     This is also an array of size 8.
- * rx_ring_mode: This defines the operation mode of all 8 rings. The valid
- *             values are 1, 2.
- * tx_fifo_num: This defines the number of Tx FIFOs thats used int the driver.
- * tx_fifo_len: This too is an array of 8. Each element defines the number of
- * Tx descriptors that can be associated with each corresponding FIFO.
- * intr_type: This defines the type of interrupt. The values can be 0(INTA),
- *     2(MSI_X). Default value is '2(MSI_X)'
- * lro_enable: Specifies whether to enable Large Receive Offload (LRO) or not.
- *     Possible values '1' for enable '0' for disable. Default is '0'
- * lro_max_pkts: This parameter defines maximum number of packets can be
- *     aggregated as a single large packet
- * napi: This parameter used to enable/disable NAPI (polling Rx)
- *     Possible values '1' for enable and '0' for disable. Default is '1'
- * ufo: This parameter used to enable/disable UDP Fragmentation Offload(UFO)
- *      Possible values '1' for enable and '0' for disable. Default is '0'
- * vlan_tag_strip: This can be used to enable or disable vlan stripping.
- *                 Possible values '1' for enable , '0' for disable.
- *                 Default is '2' - which means disable in promisc mode
- *                 and enable in non-promiscuous mode.
- * multiq: This parameter used to enable/disable MULTIQUEUE support.
- *      Possible values '1' for enable and '0' for disable. Default is '0'
- ************************************************************************/
-
+/******************************************************************************
+ *                                                                            *
+ * s2io.c: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC        *
+ * Copyright(c) 2002-2005 Neterion Inc.                                       *
+ *                                                                            *
+ * This software may be used and distributed according to the terms of        *
+ * the GNU General Public License (GPL), incorporated herein by reference.    *
+ * Drivers based on or derived from this code fall under the GPL and must     *
+ * retain the authorship, copyright and license notice.  This file is not     *
+ * a complete program and may only be used when the entire operating          *
+ * system is licensed under the GPL.                                          *
+ * See the file COPYING in this distribution for more information.            *
+ *                                                                            *
+ * Credits:                                                                   *
+ * Jeff Garzik         : For pointing out the improper error condition       *
+ *                       check in the s2io_xmit routine and also some        *
+ *                       issues in the Tx watch dog function. Also for       *
+ *                       patiently answering all those innumerable           *
+ *                       questions regaring the 2.6 porting issues.          *
+ * Stephen Hemminger   : Providing proper 2.6 porting mechanism for some     *
+ *                       macros available only in 2.6 Kernel.                *
+ * Francois Romieu     : For pointing out all code part that were            *
+ *                       deprecated and also styling related comments.       *
+ * Grant Grundler      : For helping me get rid of some Architecture         *
+ *                       dependent code.                                     *
+ * Christopher Hellwig : Some more 2.6 specific issues in the driver.        *
+ *                                                                            *
+ * The module loadable parameters that are supported by the driver and a brief*
+ * explanation of all the variables.                                          *
+ *                                                                            *
+ * rx_ring_num:                                                               *
+ *     This can be used to program the number of receive rings used          *
+ *     in the driver.                                                        *
+ * rx_ring_sz:                                                               *
+ *     This defines the number of receive blocks each ring can have.         *
+ *     This is an array of size 8.                                           *
+ * rx_ring_mode:                                                              *
+ *     This defines the operation mode of all 8 rings. Possible              *
+ *     values are 1, 2 and 5, corresponds to 1-buffer, 2-buffer,             *
+ *     and 5-buffer respectively. Default value is '1'.                      *
+ * tx_fifo_num:                                                               *
+ *     This defines the number of Tx FIFOs thats used int the driver.        *
+ * tx_fifo_len:                                                                      *
+ *     This is an array of 8. Each element defines the number of             *
+ *     Tx descriptors that can be associated with each corresponding FIFO    *
+ * intr_type:                                                                 *
+ *     This defines the type of interrupt. The values can be 0(INTA),        *
+ *     2(MSI-X). Default is '0'(INTA) for Xframe I and '2'(MSI-X) for others *
+ *     if system supports MSI-X and has 4 or more cpus, else default is '0'  *
+ * lro:        Specifies whether to enable Large Receive Offload (LRO) or not.       *
+ *     Possible values: '2' for driver default, 1' for enable and            *
+ *     '0' for disable.                                                      *
+ *     Default is '2' - LRO enabled for connections within subnet            *
+ * lro_max_bytes:                                                             *
+ *     This parameter defines maximum number of bytes that can be            *
+ *     aggregated as a single large packet                                   *
+ * napi:This parameter used to enable/disable NAPI (polling Rx)               *
+ *      Possible values: '1' for enable and '0' for disable. Default is '1'   *
+ * vlan_tag_strip:                                                            *
+ *     This can be used to enable or disable vlan tag stripping.             *
+ *     Possible values: '2' for driver default, '1' for enable and           *
+ *      '0' for disable                                                       *
+ *      Default is '2' - VLAN tag stripping enabled if vlan group present     *
+ * ufo: This parameter is to enable/disable UDP Fragmentation Offload(UFO)    *
+ *      Possible values: '1' for enable and '0' for disable. Default is '1'   *
+ * multiq:                                                                    *
+ *     This parameter is to enable/disable MULTIQUEUE support.               *
+ *     Possible values: '1' for enable and '0' for disable. Default is '0'   *
+ * rx_steering_type:                                                          *
+ *     This parameter is to configure the receive side steering              *
+ *     Possible values: '0' is no steering, '1' is Port, '2' is RTH, '3'     *
+ *     is Priority, '4' is Vlan id                                           *
+ *     Default is '2' RTH steering                                           *
+ * tx_steering_type:                                                          *
+ *     This parameter is to configure the transmit distribution              *
+ *     Possible values: '0' is no steering, '1' is Priority, '2' is vlan id, *
+ *     and '3' is L3 & L4 tuples                                             *
+ *     Default is '3' transmit distribution based on L3 & L4 tuples          *
+ ******************************************************************************/
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
-#include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
+#include <linux/inetdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/stddef.h>
 #include <linux/ioctl.h>
 #include <linux/timex.h>
+#include <linux/sched.h>
 #include <linux/ethtool.h>
-#include <linux/workqueue.h>
 #include <linux/if_vlan.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>
+#include <net/dsfield.h>
+#include <linux/version.h>
+#include <linux/proc_fs.h>
 #include <net/tcp.h>
+#include <net/sock.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/div64.h>
-#include <asm/irq.h>
+#include <asm/checksum.h>
 
 /* local include */
+#include "s2io/spdm_cfg.h"
+#include "s2io/kcompat.h"
 #include "s2io.h"
 #include "s2io-regs.h"
+#include "s2io/util.h"
 
-#define DRV_VERSION "2.0.26.25"
-
+#define DRV_VERSION "2.0.31.12965"
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
 static char s2io_driver_version[] = DRV_VERSION;
 
-static int rxd_size[2] = {32,48};
-static int rxd_count[2] = {127,85};
+static int rxd_size[3] = {32, 48, 64};
+static int rxd_count[3] = {127, 85, 63};
+
+/* FIFO mappings for all possible number of fifos configured */
+static int fifo_map[MAX_TX_FIFOS][8] = {
+       {0, 0, 0, 0, 0, 0, 0, 0},
+       {0, 0, 0, 0, 1, 1, 1, 1},
+       {0, 0, 0, 1, 1, 1, 2, 2},
+       {0, 0, 1, 1, 2, 2, 3, 3},
+       {0, 0, 1, 1, 2, 2, 3, 4},
+       {0, 0, 1, 1, 2, 3, 4, 5},
+       {0, 0, 1, 2, 3, 4, 5, 6},
+       {0, 1, 2, 3, 4, 5, 6, 7},
+};
+
+static u16 fifo_selector[MAX_TX_FIFOS] = {0, 1, 3, 3, 7, 7, 7, 7};
+
+/* Extern function prototype declaration. */
+int spdm_extract_table(void *data, struct s2io_nic *nic);
+int spdm_configure(struct s2io_nic *nic, struct spdm_cfg *info);
+static int spdm_data_processor(struct spdm_cfg *usr_info, struct s2io_nic *sp);
+int s2io_rth_configure(struct s2io_nic *nic);
+int s2io_ioctl_util(struct s2io_nic *sp, struct ifreq *rq, int cmd);
+void general_info(struct s2io_nic *sp, struct ifreq *rq);
+int s2io_snmp_init(struct s2io_nic *nic);
+int s2io_snmp_exit(struct s2io_nic *nic);
 
 static inline int RXD_IS_UP2DT(struct RxD_t *rxdp)
 {
@@ -105,6 +157,43 @@ static inline int RXD_IS_UP2DT(struct RxD_t *rxdp)
        return ret;
 }
 
+#ifdef CONFIG_PCI_MSI
+static inline irqreturn_t S2IO_RING_IN_USE(struct ring_info *ring)
+{
+       irqreturn_t ret = IRQ_NONE;
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20))
+       if (test_and_set_bit(0, (unsigned long *)(&ring->isr_cnt)))
+               ret = IRQ_HANDLED;
+#endif
+       return ret;
+}
+
+static inline void S2IO_RING_DONE(struct ring_info *ring)
+{
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20))
+       clear_bit(0, (unsigned long *)(&ring->isr_cnt));
+#endif
+       return;
+}
+static inline irqreturn_t S2IO_FIFO_IN_USE(struct s2io_nic *sp)
+{
+       irqreturn_t ret = IRQ_NONE;
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20))
+       if (test_and_set_bit(0, (unsigned long *)(&sp->isr_cnt)))
+               ret = IRQ_HANDLED;
+#endif
+       return ret;
+}
+
+static inline void S2IO_FIFO_DONE(struct s2io_nic *sp)
+{
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20))
+       clear_bit(0, (unsigned long *)(&sp->isr_cnt));
+#endif
+       return;
+}
+#endif
+
 /*
  * Cards with following subsystem_id have a link state indication
  * problem, 600B, 600C, 600D, 640B, 640C and 640D.
@@ -117,10 +206,29 @@ static inline int RXD_IS_UP2DT(struct RxD_t *rxdp)
 
 #define LINK_IS_UP(val64) (!(val64 & (ADAPTER_STATUS_RMAC_REMOTE_FAULT | \
                                      ADAPTER_STATUS_RMAC_LOCAL_FAULT)))
+#define mac_stat_info sw_err_stat
 
-static inline int is_s2io_card_up(const struct s2io_nic * sp)
+#define COPY_ETH_HDR(buf0_len, buff, ba) { \
+       *((u64*)buff) = *((u64*)ba->ba_0);      \
+       if (buf0_len == 14) {   \
+               /* Copy Ethernet header */      \
+               *((u32*)(buff + 8)) = *((u32*)(ba->ba_0 + 8));  \
+               *((u16*)(buff + 12)) = *((u16*)(ba->ba_0 + 12));        \
+       } else if (buf0_len == 18) {    \
+               /* Copy Ethernet + VLAN header */       \
+               *((u64*)(buff + 8)) = *((u64*)(ba->ba_0 + 8));  \
+               *((u16*)(buff + 16)) = *((u16*)(ba->ba_0 + 16));        \
+       } else if (buf0_len == 22) {    \
+               /* Copy Ethernet + 802_2 + SNAP header */       \
+               *((u64*)(buff + 8)) = *((u64*)(ba->ba_0 + 8));  \
+               *((u32*)(buff + 16)) = *((u32*)(ba->ba_0 + 16));        \
+               *((u16*)(buff + 20)) = *((u16*)(ba->ba_0 + 20));        \
+       }       \
+}
+
+static inline int is_s2io_card_up(const struct s2io_nic *sp)
 {
-       return test_bit(__S2IO_STATE_CARD_UP, &sp->state);
+       return test_bit(__S2IO_STATE_CARD_UP, (void *) &sp->state);
 }
 
 /* Ethtool related variables and Macros. */
@@ -132,6 +240,7 @@ static char s2io_gstrings[][ETH_GSTRING_LEN] = {
        "BIST Test\t(offline)"
 };
 
+#ifdef ETHTOOL_GSTATS
 static char ethtool_xena_stats_keys[][ETH_GSTRING_LEN] = {
        {"tmac_frms"},
        {"tmac_data_octets"},
@@ -242,28 +351,15 @@ static char ethtool_enhanced_stats_keys[][ETH_GSTRING_LEN] = {
        {"rmac_fcs_discard"},
        {"rmac_pf_discard"},
        {"rmac_da_discard"},
-       {"rmac_red_discard"},
+       {"rmac_wol_discard"},
        {"rmac_rts_discard"},
        {"rmac_ingm_full_discard"},
+       {"rmac_red_discard"},
        {"link_fault_cnt"}
 };
 
 static char ethtool_driver_stats_keys[][ETH_GSTRING_LEN] = {
        {"\n DRIVER STATISTICS"},
-       {"single_bit_ecc_errs"},
-       {"double_bit_ecc_errs"},
-       {"parity_err_cnt"},
-       {"serious_err_cnt"},
-       {"soft_reset_cnt"},
-       {"fifo_full_cnt"},
-       {"ring_0_full_cnt"},
-       {"ring_1_full_cnt"},
-       {"ring_2_full_cnt"},
-       {"ring_3_full_cnt"},
-       {"ring_4_full_cnt"},
-       {"ring_5_full_cnt"},
-       {"ring_6_full_cnt"},
-       {"ring_7_full_cnt"},
        {"alarm_transceiver_temp_high"},
        {"alarm_transceiver_temp_low"},
        {"alarm_laser_bias_current_high"},
@@ -276,34 +372,14 @@ static char ethtool_driver_stats_keys[][ETH_GSTRING_LEN] = {
        {"warn_laser_bias_current_low"},
        {"warn_laser_output_power_high"},
        {"warn_laser_output_power_low"},
-       {"lro_aggregated_pkts"},
-       {"lro_flush_both_count"},
-       {"lro_out_of_sequence_pkts"},
-       {"lro_flush_due_to_max_pkts"},
-       {"lro_avg_aggr_pkts"},
-       {"mem_alloc_fail_cnt"},
-       {"pci_map_fail_cnt"},
+       {"single_bit_ecc_errs"},
+       {"double_bit_ecc_errs"},
+       {"parity_err_cnt"},
+       {"serious_err_cnt"},
+       {"soft_reset_cnt"},
        {"watchdog_timer_cnt"},
-       {"mem_allocated"},
-       {"mem_freed"},
-       {"link_up_cnt"},
-       {"link_down_cnt"},
-       {"link_up_time"},
-       {"link_down_time"},
-       {"tx_tcode_buf_abort_cnt"},
-       {"tx_tcode_desc_abort_cnt"},
-       {"tx_tcode_parity_err_cnt"},
-       {"tx_tcode_link_loss_cnt"},
-       {"tx_tcode_list_proc_err_cnt"},
-       {"rx_tcode_parity_err_cnt"},
-       {"rx_tcode_abort_cnt"},
-       {"rx_tcode_parity_abort_cnt"},
-       {"rx_tcode_rda_fail_cnt"},
-       {"rx_tcode_unkn_prot_cnt"},
-       {"rx_tcode_fcs_err_cnt"},
-       {"rx_tcode_buf_size_err_cnt"},
-       {"rx_tcode_rxd_corrupt_cnt"},
-       {"rx_tcode_unkn_err_cnt"},
+       {"skb_null_s2io_xmit_cnt"},
+       {"skb_null_tx_intr_handler_cnt"},
        {"tda_err_cnt"},
        {"pfc_err_cnt"},
        {"pcc_err_cnt"},
@@ -320,20 +396,356 @@ static char ethtool_driver_stats_keys[][ETH_GSTRING_LEN] = {
        {"rpa_err_cnt"},
        {"rda_err_cnt"},
        {"rti_err_cnt"},
-       {"mc_err_cnt"}
+       {"mc_err_cnt"},
+       {"tx_intr_cnt"},
+       {"rx_intr_cnt"},
+};
+
+static char ethtool_driver_dbg_stats_keys[][ETH_GSTRING_LEN] = {
+       {"tmac_frms_q0"},
+       {"tmac_frms_q1"},
+       {"tmac_frms_q2"},
+       {"tmac_frms_q3"},
+       {"tmac_frms_q4"},
+       {"tmac_frms_q5"},
+       {"tmac_frms_q6"},
+       {"tmac_frms_q7"},
+       {"mem_alloc_fail_cnt"},
+       {"pci_map_fail_cnt"},
+       {"mem_allocated"},
+       {"mem_freed"},
+       {"link_up_cnt"},
+       {"link_down_cnt"},
+       {"link_up_time"},
+       {"link_down_time"}
+};
+
+#ifdef TITAN_LEGACY
+static char ethtool_titan_stats_keys[][ETH_GSTRING_LEN] = {
+       {"tx_frms[0]"},
+       {"tx_ttl_eth_octets[0]"},
+       {"tx_data_octets[0]"},
+       {"tx_mcst_frms[0]"},
+       {"tx_bcst_frms[0]"},
+       {"tx_ucst_frms[0]"},
+       {"tx_tagged_frms[0]"},
+       {"tx_vld_ip[0]"},
+       {"tx_vld_ip_octets[0]"},
+       {"tx_icmp[0]"},
+       {"tx_tcp[0]"},
+       {"tx_rst_tcp[0]"},
+       {"tx_udp[0]"},
+       {"tx_unknown_protocol[0]"},
+       {"tx_parse_error[0]"},
+       {"tx_pause_ctrl_frms[0]"},
+       {"tx_lacpdu_frms[0]"},
+       {"tx_marker_pdu_frms[0]"},
+       {"tx_marker_resp_pdu_frms[0]"},
+       {"tx_drop_ip[0]"},
+       {"tx_xgmii_char1_match[0]"},
+       {"tx_xgmii_char2_match[0]"},
+       {"tx_xgmii_column1_match[0]"},
+       {"tx_xgmii_column2_match[0]"},
+       {"tx_drop_frms[0]"},
+       {"tx_any_err_frms[0]"},
+       {"rx_ttl_frms[0]"},
+       {"rx_vld_frms[0]"},
+       {"rx_offld_frms[0]"},
+       {"rx_ttl_eth_octets[0]"},
+       {"rx_data_octets[0]"},
+       {"rx_offld_octets[0]"},
+       {"rx_vld_mcst_frms[0]"},
+       {"rx_vld_bcst_frms[0]"},
+       {"rx_accepted_ucst_frms[0]"},
+       {"rx_accepted_nucst_frms[0]"},
+       {"rx_tagged_frms[0]"},
+       {"rx_long_frms[0]"},
+       {"rx_usized_frms[0]"},
+       {"rx_osized_frms[0]"},
+       {"rx_frag_frms[0]"},
+       {"rx_jabber_frms[0]"},
+       {"rx_ttl_64_frms[0]"},
+       {"rx_ttl_65_127_frms[0]"},
+       {"rx_ttl_128_255_frms[0]"},
+       {"rx_ttl_256_511_frms[0]"},
+       {"rx_ttl_512_1023_frms[0]"},
+       {"rx_ttl_1024_1518_frms[0]"},
+       {"rx_ttl_1519_4095_frms[0]"},
+       {"rx_ttl_40956_8191_frms[0]"},
+       {"rx_ttl_8192_max_frms[0]"},
+       {"rx_ttl_gt_max_frms[0]"},
+       {"rx_ip[0]"},
+       {"rx_ip_octets[0]"},
+       {"rx_hdr_err_ip[0]"},
+       {"rx_icmp[0]"},
+       {"rx_tcp[0]"},
+       {"rx_udp[0]"},
+       {"rx_err_tcp[0]"},
+       {"rx_pause_cnt[0]"},
+       {"rx_pause_ctrl_frms[0]"},
+       {"rx_unsup_ctrl_frms[0]"},
+       {"rx_in_rng_len_err_frms[0]"},
+       {"rx_out_rng_len_err_frms[0]"},
+       {"rx_drop_frms[0]"},
+       {"rx_discarded_frms[0]"},
+       {"rx_drop_ip[0]"},
+       {"rx_err_drp_udp[0]"},
+       {"rx_lacpdu_frms[0]"},
+       {"rx_marker_pdu_frms[0]"},
+       {"rx_marker_resp_pdu_frms[0]"},
+       {"rx_unknown_pdu_frms[0]"},
+       {"rx_illegal_pdu_frms[0]"},
+       {"rx_fcs_discard[0]"},
+       {"rx_len_discard[0]"},
+       {"rx_pf_discard[0]"},
+       {"rx_trash_discard[0]"},
+       {"rx_rts_discard[0]"},
+       {"rx_wol_discard[0]"},
+       {"rx_red_discard[0]"},
+       {"rx_ingm_full_discard[0]"},
+       {"rx_xgmii_data_err_cnt[0]"},
+       {"rx_xgmii_ctrl_err_cnt[0]"},
+       {"rx_xgmii_err_sym[0]"},
+       {"rx_xgmii_char1_match[0]"},
+       {"rx_xgmii_char2_match[0]"},
+       {"rx_xgmii_column1_match[0]"},
+       {"rx_xgmii_column2_match[0]"},
+       {"rx_local_fault[0]"},
+       {"rx_remote_fault[0]"},
+       {"rx_queue_full[0]"},
+       {"tx_frms[1]"},
+       {"tx_ttl_eth_octets[1]"},
+       {"tx_data_octets[1]"},
+       {"tx_mcst_frms[1]"},
+       {"tx_bcst_frms[1]"},
+       {"tx_ucst_frms[1]"},
+       {"tx_tagged_frms[1]"},
+       {"tx_vld_ip[1]"},
+       {"tx_vld_ip_octets[1]"},
+       {"tx_icmp[1]"},
+       {"tx_tcp[1]"},
+       {"tx_rst_tcp[1]"},
+       {"tx_udp[1]"},
+       {"tx_unknown_protocol[1]"},
+       {"tx_parse_error[1]"},
+       {"tx_pause_ctrl_frms[1]"},
+       {"tx_lacpdu_frms[1]"},
+       {"tx_marker_pdu_frms[1]"},
+       {"tx_marker_resp_pdu_frms[1]"},
+       {"tx_drop_ip[1]"},
+       {"tx_xgmii_char1_match[1]"},
+       {"tx_xgmii_char2_match[1]"},
+       {"tx_xgmii_column1_match[1]"},
+       {"tx_xgmii_column2_match[1]"},
+       {"tx_drop_frms[1]"},
+       {"tx_any_err_frms[1]"},
+       {"rx_ttl_frms[1]"},
+       {"rx_vld_frms[1]"},
+       {"rx_offld_frms[1]"},
+       {"rx_ttl_eth_octets[1]"},
+       {"rx_data_octets[1]"},
+       {"rx_offld_octets[1]"},
+       {"rx_vld_mcst_frms[1]"},
+       {"rx_vld_bcst_frms[1]"},
+       {"rx_accepted_ucst_frms[1]"},
+       {"rx_accepted_nucst_frms[1]"},
+       {"rx_tagged_frms[1]"},
+       {"rx_long_frms[1]"},
+       {"rx_usized_frms[1]"},
+       {"rx_osized_frms[1]"},
+       {"rx_frag_frms[1]"},
+       {"rx_jabber_frms[1]"},
+       {"rx_ttl_64_frms[1]"},
+       {"rx_ttl_65_127_frms[1]"},
+       {"rx_ttl_128_255_frms[1]"},
+       {"rx_ttl_256_511_frms[1]"},
+       {"rx_ttl_512_1123_frms[1]"},
+       {"rx_ttl_1124_1518_frms[1]"},
+       {"rx_ttl_1519_4195_frms[1]"},
+       {"rx_ttl_41956_8191_frms[1]"},
+       {"rx_ttl_8192_max_frms[1]"},
+       {"rx_ttl_gt_max_frms[1]"},
+       {"rx_ip[1]"},
+       {"rx_ip_octets[1]"},
+       {"rx_hdr_err_ip[1]"},
+       {"rx_icmp[1]"},
+       {"rx_tcp[1]"},
+       {"rx_udp[1]"},
+       {"rx_err_tcp[1]"},
+       {"rx_pause_cnt[1]"},
+       {"rx_pause_ctrl_frms[1]"},
+       {"rx_unsup_ctrl_frms[1]"},
+       {"rx_in_rng_len_err_frms[1]"},
+       {"rx_out_rng_len_err_frms[1]"},
+       {"rx_drop_frms[1]"},
+       {"rx_discarded_frms[1]"},
+       {"rx_drop_ip[1]"},
+       {"rx_err_drp_udp[1]"},
+       {"rx_lacpdu_frms[1]"},
+       {"rx_marker_pdu_frms[1]"},
+       {"rx_marker_resp_pdu_frms[1]"},
+       {"rx_unknown_pdu_frms[1]"},
+       {"rx_illegal_pdu_frms[1]"},
+       {"rx_fcs_discard[1]"},
+       {"rx_len_discard[1]"},
+       {"rx_pf_discard[1]"},
+       {"rx_trash_discard[1]"},
+       {"rx_rts_discard[1]"},
+       {"rx_wol_discard[1]"},
+       {"rx_red_discard[1]"},
+       {"rx_ingm_full_discard[1]"},
+       {"rx_xgmii_data_err_cnt[1]"},
+       {"rx_xgmii_ctrl_err_cnt[1]"},
+       {"rx_xgmii_err_sym[1]"},
+       {"rx_xgmii_char1_match[1]"},
+       {"rx_xgmii_char2_match[1]"},
+       {"rx_xgmii_column1_match[1]"},
+       {"rx_xgmii_column2_match[1]"},
+       {"rx_local_fault[1]"},
+       {"rx_remote_fault[1]"},
+       {"rx_queue_full[1]"},
+       {"tx_frms[2]"},
+       {"tx_ttl_eth_octets[2]"},
+       {"tx_data_octets[2]"},
+       {"tx_mcst_frms[2]"},
+       {"tx_bcst_frms[2]"},
+       {"tx_ucst_frms[2]"},
+       {"tx_tagged_frms[2]"},
+       {"tx_vld_ip[2]"},
+       {"tx_vld_ip_octets[2]"},
+       {"tx_icmp[2]"},
+       {"tx_tcp[2]"},
+       {"tx_rst_tcp[2]"},
+       {"tx_udp[2]"},
+       {"tx_unknown_protocol[2]"},
+       {"tx_parse_error[2]"},
+       {"tx_pause_ctrl_frms[2]"},
+       {"tx_lacpdu_frms[2]"},
+       {"tx_marker_pdu_frms[2]"},
+       {"tx_marker_resp_pdu_frms[2]"},
+       {"tx_drop_ip[2]"},
+       {"tx_xgmii_char2_match[2]"},
+       {"tx_xgmii_char2_match[2]"},
+       {"tx_xgmii_column2_match[2]"},
+       {"tx_xgmii_column2_match[2]"},
+       {"tx_drop_frms[2]"},
+       {"tx_any_err_frms[2]"},
+       {"rx_ttl_frms[2]"},
+       {"rx_vld_frms[2]"},
+       {"rx_offld_frms[2]"},
+       {"rx_ttl_eth_octets[2]"},
+       {"rx_data_octets[2]"},
+       {"rx_offld_octets[2]"},
+       {"rx_vld_mcst_frms[2]"},
+       {"rx_vld_bcst_frms[2]"},
+       {"rx_accepted_ucst_frms[2]"},
+       {"rx_accepted_nucst_frms[2]"},
+       {"rx_tagged_frms[2]"},
+       {"rx_long_frms[2]"},
+       {"rx_osized_frms[2]"},
+       {"rx_frag_frms[2]"},
+       {"rx_usized_frms[2]"},
+       {"rx_jabber_frms[2]"},
+       {"rx_ttl_64_frms[2]"},
+       {"rx_ttl_65_227_frms[2]"},
+       {"rx_ttl_228_255_frms[2]"},
+       {"rx_ttl_256_522_frms[2]"},
+       {"rx_ttl_522_2223_frms[2]"},
+       {"rx_ttl_2224_2528_frms[2]"},
+       {"rx_ttl_2529_4295_frms[2]"},
+       {"rx_ttl_42956_8292_frms[2]"},
+       {"rx_ttl_8292_max_frms[2]"},
+       {"rx_ttl_gt_max_frms[2]"},
+       {"rx_ip[2]"},
+       {"rx_ip_octets[2]"},
+       {"rx_hdr_err_ip[2]"},
+       {"rx_icmp[2]"},
+       {"rx_tcp[2]"},
+       {"rx_udp[2]"},
+       {"rx_err_tcp[2]"},
+       {"rx_pause_cnt[2]"},
+       {"rx_pause_ctrl_frms[2]"},
+       {"rx_unsup_ctrl_frms[2]"},
+       {"rx_in_rng_len_err_frms[2]"},
+       {"rx_out_rng_len_err_frms[2]"},
+       {"rx_drop_frms[2]"},
+       {"rx_discarded_frms[2]"},
+       {"rx_drop_ip[2]"},
+       {"rx_err_drp_udp[2]"},
+       {"rx_lacpdu_frms[2]"},
+       {"rx_marker_pdu_frms[2]"},
+       {"rx_marker_resp_pdu_frms[2]"},
+       {"rx_unknown_pdu_frms[2]"},
+       {"rx_illegal_pdu_frms[2]"},
+       {"rx_fcs_discard[2]"},
+       {"rx_len_discard[2]"},
+       {"rx_pf_discard[2]"},
+       {"rx_trash_discard[2]"},
+       {"rx_rts_discard[2]"},
+       {"rx_wol_discard[2]"},
+       {"rx_red_discard[2]"},
+       {"rx_ingm_full_discard[2]"},
+       {"rx_xgmii_data_err_cnt[2]"},
+       {"rx_xgmii_ctrl_err_cnt[2]"},
+       {"rx_xgmii_err_sym[2]"},
+       {"rx_xgmii_char2_match[2]"},
+       {"rx_xgmii_char2_match[2]"},
+       {"rx_xgmii_column2_match[2]"},
+       {"rx_xgmii_column2_match[2]"},
+       {"rx_local_fault[2]"},
+       {"rx_remote_fault[2]"},
+       {"rx_queue_full[2]"},
+       {"aggr_tx_frms[0]"},
+       {"aggr_tx_mcst_frms[0]"},
+       {"aggr_tx_bcst_frms[0]"},
+       {"aggr_tx_discarded_frms[0]"},
+       {"aggr_tx_errored_frms[0]"},
+       {"aggr_rx_frms[0]"},
+       {"aggr_rx_data_octets[0]"},
+       {"aggr_rx_mcst_frms[0]"},
+       {"aggr_rx_bcst_frms[0]"},
+       {"aggr_rx_discarded_frms[0]"},
+       {"aggr_rx_errored_frms[0]"},
+       {"aggr_rx_unknown_protocol_frms[0]"},
+       {"aggr_tx_frms[1]"},
+       {"aggr_tx_mcst_frms[1]"},
+       {"aggr_tx_bcst_frms[1]"},
+       {"aggr_tx_discarded_frms[1]"},
+       {"aggr_tx_errored_frms[1]"},
+       {"aggr_rx_frms[1]"},
+       {"aggr_rx_data_octets[1]"},
+       {"aggr_rx_mcst_frms[1]"},
+       {"aggr_rx_bcst_frms[1]"},
+       {"aggr_rx_discarded_frms[1]"},
+       {"aggr_rx_errored_frms[1]"},
+       {"aggr_rx_unknown_protocol_frms[1]"},
 };
+#endif
 
-#define S2IO_XENA_STAT_LEN     ARRAY_SIZE(ethtool_xena_stats_keys)
-#define S2IO_ENHANCED_STAT_LEN ARRAY_SIZE(ethtool_enhanced_stats_keys)
-#define S2IO_DRIVER_STAT_LEN   ARRAY_SIZE(ethtool_driver_stats_keys)
+#define S2IO_XENA_STAT_LEN sizeof(ethtool_xena_stats_keys) / ETH_GSTRING_LEN
+#define S2IO_ENHANCED_STAT_LEN  (sizeof(ethtool_enhanced_stats_keys) / \
+                               ETH_GSTRING_LEN)
+#define S2IO_DRIVER_STAT_LEN (sizeof(ethtool_driver_stats_keys) / \
+                               ETH_GSTRING_LEN)
+#define S2IO_DRIVER_DBG_STAT_LEN (sizeof(ethtool_driver_dbg_stats_keys) / \
+                                       ETH_GSTRING_LEN)
+
+#define XFRAME_I_STAT_LEN (S2IO_XENA_STAT_LEN + S2IO_DRIVER_STAT_LEN)
+#define XFRAME_II_STAT_LEN (XFRAME_I_STAT_LEN + S2IO_ENHANCED_STAT_LEN)
+
+#ifdef TITAN_LEGACY
+       #define S2IO_TITAN_STAT_LEN
+               sizeof(ethtool_titan_stats_keys) / ETH_GSTRING_LEN
+       #define S2IO_TITAN_STAT_STRINGS_LEN
+               S2IO_TITAN_STAT_LEN * ETH_GSTRING_LEN
+#endif
 
-#define XFRAME_I_STAT_LEN (S2IO_XENA_STAT_LEN + S2IO_DRIVER_STAT_LEN )
-#define XFRAME_II_STAT_LEN (XFRAME_I_STAT_LEN + S2IO_ENHANCED_STAT_LEN )
+#define XFRAME_I_STAT_STRINGS_LEN (XFRAME_I_STAT_LEN * ETH_GSTRING_LEN)
+#define XFRAME_II_STAT_STRINGS_LEN (XFRAME_II_STAT_LEN * ETH_GSTRING_LEN)
 
-#define XFRAME_I_STAT_STRINGS_LEN ( XFRAME_I_STAT_LEN * ETH_GSTRING_LEN )
-#define XFRAME_II_STAT_STRINGS_LEN ( XFRAME_II_STAT_LEN * ETH_GSTRING_LEN )
+#endif
 
-#define S2IO_TEST_LEN  ARRAY_SIZE(s2io_gstrings)
+#define S2IO_TEST_LEN  sizeof(s2io_gstrings) / ETH_GSTRING_LEN
 #define S2IO_STRINGS_LEN       S2IO_TEST_LEN * ETH_GSTRING_LEN
 
 #define S2IO_TIMER_CONF(timer, handle, arg, exp)               \
@@ -352,47 +764,7 @@ static void do_s2io_copy_mac_addr(struct s2io_nic *sp, int offset, u64 mac_addr)
        sp->def_mac_addr[offset].mac_addr[1] = (u8) (mac_addr >> 32);
        sp->def_mac_addr[offset].mac_addr[0] = (u8) (mac_addr >> 40);
 }
-/* Add the vlan */
-static void s2io_vlan_rx_register(struct net_device *dev,
-                                       struct vlan_group *grp)
-{
-       int i;
-       struct s2io_nic *nic = dev->priv;
-       unsigned long flags[MAX_TX_FIFOS];
-       struct mac_info *mac_control = &nic->mac_control;
-       struct config_param *config = &nic->config;
-
-       for (i = 0; i < config->tx_fifo_num; i++)
-               spin_lock_irqsave(&mac_control->fifos[i].tx_lock, flags[i]);
-
-       nic->vlgrp = grp;
-       for (i = config->tx_fifo_num - 1; i >= 0; i--)
-               spin_unlock_irqrestore(&mac_control->fifos[i].tx_lock,
-                               flags[i]);
-}
 
-/* A flag indicating whether 'RX_PA_CFG_STRIP_VLAN_TAG' bit is set or not */
-static int vlan_strip_flag;
-
-/* Unregister the vlan */
-static void s2io_vlan_rx_kill_vid(struct net_device *dev, unsigned long vid)
-{
-       int i;
-       struct s2io_nic *nic = dev->priv;
-       unsigned long flags[MAX_TX_FIFOS];
-       struct mac_info *mac_control = &nic->mac_control;
-       struct config_param *config = &nic->config;
-
-       for (i = 0; i < config->tx_fifo_num; i++)
-               spin_lock_irqsave(&mac_control->fifos[i].tx_lock, flags[i]);
-
-       if (nic->vlgrp)
-               vlan_group_set_device(nic->vlgrp, vid, NULL);
-
-       for (i = config->tx_fifo_num - 1; i >= 0; i--)
-               spin_unlock_irqrestore(&mac_control->fifos[i].tx_lock,
-                       flags[i]);
-}
 
 /*
  * Constants to be programmed into the Xena's registers, to configure
@@ -460,13 +832,17 @@ static const u64 fix_mac[] = {
 };
 
 MODULE_LICENSE("GPL");
+#ifdef MODULE_VERSION
 MODULE_VERSION(DRV_VERSION);
+#endif
 
 
 /* Module Loadable parameters. */
-S2IO_PARM_INT(tx_fifo_num, FIFO_DEFAULT_NUM);
-S2IO_PARM_INT(rx_ring_num, 1);
-S2IO_PARM_INT(multiq, 0);
+S2IO_PARM_INT(tx_fifo_num, 0);
+S2IO_PARM_INT(rx_ring_num, 0);
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+S2IO_PARM_INT(multiq, 1);
+#endif
 S2IO_PARM_INT(rx_ring_mode, 1);
 S2IO_PARM_INT(use_continuous_tx_intrs, 1);
 S2IO_PARM_INT(rmac_pause_time, 0x100);
@@ -476,36 +852,63 @@ S2IO_PARM_INT(shared_splits, 0);
 S2IO_PARM_INT(tmac_util_period, 5);
 S2IO_PARM_INT(rmac_util_period, 5);
 S2IO_PARM_INT(l3l4hdr_size, 128);
-/* 0 is no steering, 1 is Priority steering, 2 is Default steering */
-S2IO_PARM_INT(tx_steering_type, TX_DEFAULT_STEERING);
 /* Frequency of Rx desc syncs expressed as power of 2 */
 S2IO_PARM_INT(rxsync_frequency, 3);
-/* Interrupt type. Values can be 0(INTA), 2(MSI_X) */
-S2IO_PARM_INT(intr_type, 2);
+/* Interrupt type. Values can be 0(INTA), 2(MSI-X)*/
+#ifdef CONFIG_PCI_MSI
+S2IO_PARM_INT(intr_type, DEF_MSI_X);
+#else
+S2IO_PARM_INT(intr_type, INTA);
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 9))
+static unsigned int lro_enable = S2IO_DONOT_AGGREGATE;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
+S2IO_PARM_INT(lro, S2IO_DONOT_AGGREGATE);
+#else
+/* Large receive offload feature */
+module_param_named(lro, lro_enable, uint, 0);
+#endif
+#else
+static unsigned int lro_enable = S2IO_DONT_AGGR_FWD_PKTS;
 /* Large receive offload feature */
-static unsigned int lro_enable;
 module_param_named(lro, lro_enable, uint, 0);
+#endif
 
 /* Max pkts to be aggregated by LRO at one time. If not specified,
- * aggregation happens until we hit max IP pkt size(64K)
+ * aggregation happens until we hit max IP pkt size(16K)
  */
-S2IO_PARM_INT(lro_max_pkts, 0xFFFF);
+S2IO_PARM_INT(lro_max_bytes, 0x4000);
 S2IO_PARM_INT(indicate_max_pkts, 0);
-
 S2IO_PARM_INT(napi, 1);
-S2IO_PARM_INT(ufo, 0);
-S2IO_PARM_INT(vlan_tag_strip, NO_STRIP_IN_PROMISC);
+S2IO_PARM_INT(vlan_tag_strip, S2IO_DEFAULT_STRIP_MODE_VLAN_TAG);
+S2IO_PARM_INT(ufo, 1);
+S2IO_PARM_INT(rx_steering_type, RTH_STEERING_DEFAULT);
+S2IO_PARM_INT(tx_steering_type, TX_STEERING_DEFAULT);
+S2IO_PARM_INT(rth_protocol, 0x1);
+S2IO_PARM_INT(rth_mask, 0);
 
 static unsigned int tx_fifo_len[MAX_TX_FIFOS] =
-    {DEFAULT_FIFO_0_LEN, [1 ...(MAX_TX_FIFOS - 1)] = DEFAULT_FIFO_1_7_LEN};
+       {[0 ...(MAX_TX_FIFOS - 1)] = FIFO_DEFAULT_LEN};
 static unsigned int rx_ring_sz[MAX_RX_RINGS] =
     {[0 ...(MAX_RX_RINGS - 1)] = SMALL_BLK_CNT};
 static unsigned int rts_frm_len[MAX_RX_RINGS] =
     {[0 ...(MAX_RX_RINGS - 1)] = 0 };
-
+#ifdef module_param_array
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10))
 module_param_array(tx_fifo_len, uint, NULL, 0);
 module_param_array(rx_ring_sz, uint, NULL, 0);
 module_param_array(rts_frm_len, uint, NULL, 0);
+#else
+module_param_array(tx_fifo_len, int, tx_fifo_num, 0);
+module_param_array(rx_ring_sz, int, rx_ring_num, 0);
+module_param_array(rts_frm_len, int, rx_ring_num, 0);
+#endif
+#else
+MODULE_PARM(tx_fifo_len, "1-" __MODULE_STRING(8) "i");
+MODULE_PARM(rx_ring_sz, "1-" __MODULE_STRING(8) "i");
+MODULE_PARM(rts_frm_len, "1-" __MODULE_STRING(8) "i");
+#endif
 
 /*
  * S2IO device table.
@@ -517,151 +920,378 @@ static struct pci_device_id s2io_tbl[] __devinitdata = {
        {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_S2IO_UNI,
         PCI_ANY_ID, PCI_ANY_ID},
        {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_HERC_WIN,
-         PCI_ANY_ID, PCI_ANY_ID},
-        {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_HERC_UNI,
-         PCI_ANY_ID, PCI_ANY_ID},
+        PCI_ANY_ID, PCI_ANY_ID},
+       {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_HERC_UNI,
+        PCI_ANY_ID, PCI_ANY_ID},
+#ifdef TITAN_LEGACY
+       {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_TITAN_WIN,
+        PCI_ANY_ID, PCI_ANY_ID},
+       {PCI_VENDOR_ID_S2IO, PCI_DEVICE_ID_TITAN_UNI,
+        PCI_ANY_ID, PCI_ANY_ID},
+#endif
        {0,}
 };
 
 MODULE_DEVICE_TABLE(pci, s2io_tbl);
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21))
 static struct pci_error_handlers s2io_err_handler = {
-       .error_detected = s2io_io_error_detected,
-       .slot_reset = s2io_io_slot_reset,
-       .resume = s2io_io_resume,
+       .error_detected = s2io_io_error_detected,
+       .slot_reset = s2io_io_slot_reset,
+       .resume = s2io_io_resume,
 };
+#endif
 
 static struct pci_driver s2io_driver = {
-      .name = "S2IO",
-      .id_table = s2io_tbl,
-      .probe = s2io_init_nic,
-      .remove = __devexit_p(s2io_rem_nic),
-      .err_handler = &s2io_err_handler,
+       .name = "S2IO",
+       .id_table = s2io_tbl,
+       .probe = s2io_init_nic,
+       .remove = __devexit_p(s2io_rem_nic),
+#ifdef CONFIG_PM
+       .suspend = s2io_pm_suspend,
+       .resume = s2io_pm_resume,
+#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21))
+       .err_handler = &s2io_err_handler,
+#endif
 };
 
-/* A simplifier macro used both by init and free shared_mem Fns(). */
-#define TXD_MEM_PAGE_CNT(len, per_each) ((len+per_each - 1) / per_each)
-
-/* netqueue manipulation helper functions */
-static inline void s2io_stop_all_tx_queue(struct s2io_nic *sp)
+static void s2io_handle_vlan_tag_strip(struct s2io_nic *nic, int flag)
 {
-       if (!sp->config.multiq) {
-               int i;
+       struct XENA_dev_config __iomem *bar0 = nic->bar0;
+       u64 val64;
 
-               for (i = 0; i < sp->config.tx_fifo_num; i++)
-                       sp->mac_control.fifos[i].queue_state = FIFO_QUEUE_STOP;
-       }
-       netif_tx_stop_all_queues(sp->dev);
+       val64 = readq(&bar0->rx_pa_cfg);
+       if (flag == S2IO_DO_NOT_STRIP_VLAN_TAG)
+               val64 &= ~RX_PA_CFG_STRIP_VLAN_TAG;
+       else
+               val64 |= RX_PA_CFG_STRIP_VLAN_TAG;
+
+       writeq(val64, &bar0->rx_pa_cfg);
 }
 
-static inline void s2io_stop_tx_queue(struct s2io_nic *sp, int fifo_no)
+/* Register or unregister the vlan group*/
+static void s2io_vlan_rx_register(struct net_device *dev,
+                                       struct vlan_group *grp)
 {
-       if (!sp->config.multiq)
-               sp->mac_control.fifos[fifo_no].queue_state =
-                       FIFO_QUEUE_STOP;
+       int i;
+       struct s2io_nic *nic = dev->priv;
+       unsigned long flags[MAX_TX_FIFOS];
+       struct mac_info *mac_control = &nic->mac_control;
+       struct config_param *config = &nic->config;
 
-       netif_tx_stop_all_queues(sp->dev);
-}
+       for (i = 0; i < config->tx_fifo_num; i++)
+               spin_lock_irqsave(&mac_control->fifos[i].tx_lock, flags[i]);
 
-static inline void s2io_start_all_tx_queue(struct s2io_nic *sp)
-{
-       if (!sp->config.multiq) {
-               int i;
+       nic->vlgrp = grp;
 
-               for (i = 0; i < sp->config.tx_fifo_num; i++)
-                       sp->mac_control.fifos[i].queue_state = FIFO_QUEUE_START;
+       /* if vlgrp is NULL disable VLAN stripping */
+       if (config->vlan_tag_strip == S2IO_DEFAULT_STRIP_MODE_VLAN_TAG) {
+               if (!grp)
+                       nic->vlan_strip_flag = S2IO_DO_NOT_STRIP_VLAN_TAG;
+               else
+                       nic->vlan_strip_flag = S2IO_STRIP_VLAN_TAG;
        }
-       netif_tx_start_all_queues(sp->dev);
-}
 
-static inline void s2io_start_tx_queue(struct s2io_nic *sp, int fifo_no)
-{
-       if (!sp->config.multiq)
-               sp->mac_control.fifos[fifo_no].queue_state =
-                       FIFO_QUEUE_START;
+       s2io_handle_vlan_tag_strip(nic, nic->vlan_strip_flag);
+
+       for (i = config->tx_fifo_num - 1; i >= 0; i--)
+               spin_unlock_irqrestore(&mac_control->fifos[i].tx_lock,
+                       flags[i]);
 
-       netif_tx_start_all_queues(sp->dev);
+       for (i = 0; i < config->rx_ring_num; i++) {
+               mac_control->rings[i].vlan_strip_flag = nic->vlan_strip_flag;
+               mac_control->rings[i].vlgrp = nic->vlgrp;
+       }
 }
 
-static inline void s2io_wake_all_tx_queue(struct s2io_nic *sp)
+/**
+ *     rts_vid_steer - Receive traffic steering based on VID
+ *     @nic: device private variable
+ *     @vid: VLAN ID to map
+ *     @ring: ring to steer the above VLAN ID
+ *     @enable: 1 - Enable the steering, 0 - Disable the steering
+ *     Description: The function configures the receive steering to
+ *     steer the VLAN ID to the desired receive ring.
+ *     Return Value:  SUCCESS on success and
+ *     '-1' on failure (endian settings incorrect).
+ */
+static int rts_vid_steer(struct s2io_nic *nic, u16 vid, u8 ring, u8 enable)
 {
-       if (!sp->config.multiq) {
-               int i;
+       struct XENA_dev_config __iomem *bar0 = nic->bar0;
+       register u64 val64 = 0;
 
-               for (i = 0; i < sp->config.tx_fifo_num; i++)
-                       sp->mac_control.fifos[i].queue_state = FIFO_QUEUE_START;
-       }
-       netif_tx_wake_all_queues(sp->dev);
+       if (vid >= VLAN_VID_MASK)
+               return FAILURE;
+
+       val64 = RTS_VID_MEM_DATA(ring) |
+               RTS_VID_MEM_ENTRY_EN(enable);
+
+       writeq(val64, &bar0->rts_vid_mem_data);
+
+       val64 = RTS_VID_MEM_CTRL_WE |
+                       RTS_VID_MEM_CTRL_STROBE_NEW_CMD |
+                       RTS_VID_MEM_CTRL_OFFSET(vid);
+
+       writeq(val64, &bar0->rts_vid_mem_ctrl);
+
+       return wait_for_cmd_complete(&bar0->rts_vid_mem_ctrl,
+                               RTS_VID_MEM_CTRL_STROBE_CMD_BEING_EXECUTED,
+                               S2IO_BIT_RESET);
 }
 
-static inline void s2io_wake_tx_queue(
-       struct fifo_info *fifo, int cnt, u8 multiq)
+/* Add the vlan */
+static void s2io_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)
 {
+       int i;
+       struct s2io_nic *nic = dev->priv;
+       unsigned long flags[MAX_TX_FIFOS];
+       struct mac_info *mac_control = &nic->mac_control;
+       struct config_param *config = &nic->config;
 
-       if (multiq) {
-               if (cnt && __netif_subqueue_stopped(fifo->dev, fifo->fifo_no))
-                       netif_wake_subqueue(fifo->dev, fifo->fifo_no);
-       } else if (cnt && (fifo->queue_state == FIFO_QUEUE_STOP)) {
-               if (netif_queue_stopped(fifo->dev)) {
-                       fifo->queue_state = FIFO_QUEUE_START;
-                       netif_wake_queue(fifo->dev);
+       if (vid >= VLAN_VID_MASK)
+               return;
+
+       for (i = 0; i < config->tx_fifo_num; i++)
+               spin_lock_irqsave(&mac_control->fifos[i].tx_lock, flags[i]);
+
+       if (nic->vlgrp) {
+               if ((config->tx_steering_type == TX_VLAN_STEERING) ||
+                       (config->rx_steering_type == RX_VLAN_STEERING)) {
+                       nic->vlan_array[vid] = nic->vlan_added;
+
+                       if (config->rx_steering_type == RX_VLAN_STEERING) {
+                               rts_vid_steer(nic, vid, nic->vlan_added, 1);
+                               ++nic->vlan_added;
+                               nic->vlan_added %= config->rx_ring_num;
+                       } else {
+                               ++nic->vlan_added;
+                               nic->vlan_added %= config->tx_fifo_num;
+                       }
                }
        }
-}
 
-/**
- * init_shared_mem - Allocation and Initialization of Memory
- * @nic: Device private variable.
- * Description: The function allocates all the memory areas shared
- * between the NIC and the driver. This includes Tx descriptors,
- * Rx descriptors and the statistics block.
- */
+       for (i = config->tx_fifo_num - 1; i >= 0; i--)
+               spin_unlock_irqrestore(&mac_control->fifos[i].tx_lock,
+                       flags[i]);
+}
 
-static int init_shared_mem(struct s2io_nic *nic)
+/* Unregister the vlan */
+static void s2io_vlan_rx_kill_vid(struct net_device *dev, unsigned long vid)
 {
-       u32 size;
-       void *tmp_v_addr, *tmp_v_addr_next;
-       dma_addr_t tmp_p_addr, tmp_p_addr_next;
-       struct RxD_block *pre_rxd_blk = NULL;
-       int i, j, blk_cnt;
-       int lst_size, lst_per_page;
-       struct net_device *dev = nic->dev;
-       unsigned long tmp;
-       struct buffAdd *ba;
+       int i;
+       struct s2io_nic *nic = dev->priv;
+       unsigned long flags[MAX_TX_FIFOS];
+       struct mac_info *mac_control = &nic->mac_control;
+       struct config_param *config = &nic->config;
 
-       struct mac_info *mac_control;
-       struct config_param *config;
-       unsigned long long mem_allocated = 0;
+       if (vid >= VLAN_VID_MASK)
+               return;
 
-       mac_control = &nic->mac_control;
-       config = &nic->config;
+       for (i = 0; i < config->tx_fifo_num; i++)
+               spin_lock_irqsave(&mac_control->fifos[i].tx_lock, flags[i]);
 
+       if (nic->vlgrp) {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21))
+               vlan_group_set_device(nic->vlgrp, vid, NULL);
+#else
+               nic->vlgrp->vlan_devices[vid] = NULL;
+#endif
+               /* Remove vlan id receive steering here */
+               if (config->rx_steering_type == RX_VLAN_STEERING)
+                       rts_vid_steer(nic, vid, nic->vlan_array[vid], 0);
 
-       /* Allocation and initialization of TXDLs in FIOFs */
-       size = 0;
-       for (i = 0; i < config->tx_fifo_num; i++) {
-               size += config->tx_cfg[i].fifo_len;
-       }
-       if (size > MAX_AVAILABLE_TXDS) {
-               DBG_PRINT(ERR_DBG, "s2io: Requested TxDs too high, ");
-               DBG_PRINT(ERR_DBG, "Requested: %d, max supported: 8192\n", size);
-               return -EINVAL;
+                       if (nic->vlan_added)
+                               --nic->vlan_added;
+                       nic->vlan_array[vid] = S2IO_INVALID_RING;
        }
 
-       size = 0;
-       for (i = 0; i < config->tx_fifo_num; i++) {
-               size = config->tx_cfg[i].fifo_len;
-               /*
-                * Legal values are from 2 to 8192
-                */
-               if (size < 2) {
-                       DBG_PRINT(ERR_DBG, "s2io: Invalid fifo len (%d)", size);
-                       DBG_PRINT(ERR_DBG, "for fifo %d\n", i);
-                       DBG_PRINT(ERR_DBG, "s2io: Legal values for fifo len"
-                               "are 2 to 8192\n");
-                       return -EINVAL;
+       for (i = config->tx_fifo_num - 1; i >= 0; i--)
+               spin_unlock_irqrestore(&mac_control->fifos[i].tx_lock,
+                       flags[i]);
+}
+
+/* multiqueue manipulation helper functions */
+static inline void s2io_stop_all_tx_queue(struct s2io_nic *sp)
+{
+       int i;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+       if(sp->config.multiq) {
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       netif_stop_subqueue(sp->dev, i);
+       } else
+#endif
+       {
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       sp->mac_control.fifos[i].queue_state = FIFO_QUEUE_STOP;
+               netif_stop_queue(sp->dev);
+       }
+}
+
+static inline void s2io_stop_tx_queue(struct s2io_nic *sp, int fifo_no)
+{
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+       if (sp->config.multiq)
+               netif_stop_subqueue(sp->dev, fifo_no);
+       else
+#endif
+       {
+               sp->mac_control.fifos[fifo_no].queue_state =
+                       FIFO_QUEUE_STOP;
+               netif_stop_queue(sp->dev);
+       }
+}
+
+static inline void s2io_start_all_tx_queue(struct s2io_nic *sp)
+{
+       int i;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+       if (sp->config.multiq) {
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       netif_start_subqueue(sp->dev, i);
+       } else
+#endif
+       {
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       sp->mac_control.fifos[i].queue_state = FIFO_QUEUE_START;
+               netif_start_queue(sp->dev);
+       }
+}
+
+static inline void s2io_start_tx_queue(struct s2io_nic *sp, int fifo_no)
+{
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+       if (sp->config.multiq)
+               netif_start_subqueue(sp->dev, fifo_no);
+       else
+#endif
+       {
+               sp->mac_control.fifos[fifo_no].queue_state =
+                       FIFO_QUEUE_START;
+               netif_start_queue(sp->dev);
+       }
+}
+
+static inline void s2io_wake_all_tx_queue(struct s2io_nic *sp)
+{
+       int i;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+       if (sp->config.multiq) {
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       netif_wake_subqueue(sp->dev, i);
+       } else
+#endif
+       {
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       sp->mac_control.fifos[i].queue_state = FIFO_QUEUE_START;
+               netif_wake_queue(sp->dev);
+       }
+}
+
+static inline void s2io_wake_tx_queue(
+       struct fifo_info *fifo, int cnt, u8 multiq)
+{
+
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+       if (multiq) {
+               if (cnt && __netif_subqueue_stopped(fifo->dev, fifo->fifo_no))
+                       netif_wake_subqueue(fifo->dev, fifo->fifo_no);
+       }
+       else
+#endif
+       if (cnt && (fifo->queue_state == FIFO_QUEUE_STOP)) {
+               if (netif_queue_stopped(fifo->dev)) {
+                       fifo->queue_state = FIFO_QUEUE_START;
+                       netif_wake_queue(fifo->dev);
                }
        }
+}
+
+/* A simplifier macro used both by init and free shared_mem Fns(). */
+#define TXD_MEM_PAGE_CNT(len, per_each) ((len+per_each - 1) / per_each)
+
+void *s2io_kzalloc(int size)
+{
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14))
+       void *ret = kmalloc(size, GFP_KERNEL);
+       if(ret)
+               return(memset(ret, 0, size));
+       else
+               return NULL;
+#else
+       return(kzalloc(size, GFP_KERNEL));
+#endif
+}
+
+static int alloc_ethtool_sw_stat(struct s2io_nic *sp)
+{
+       int i;
+       struct mac_info *mac_control = &sp->mac_control;
+
+       sp->sw_dbg_stat = s2io_kzalloc(sizeof(struct swDbgStat));
+       if (!sp->sw_dbg_stat)
+               return -ENOMEM;
+       sp->sw_dbg_stat->mem_allocated += sizeof(struct swDbgStat);
+
+       sp->xpak_stat = s2io_kzalloc(sizeof(struct xpakStat));
+       if (!sp->xpak_stat)
+               return -ENOMEM;
+       sp->sw_dbg_stat->mem_allocated += sizeof(struct xpakStat);
+
+       sp->sw_err_stat = s2io_kzalloc(sizeof(struct swErrStat));
+       if (!sp->sw_err_stat)
+               return -ENOMEM;
+       sp->sw_dbg_stat->mem_allocated += sizeof(struct swErrStat);
+
+       for (i = 0; i < sp->config.tx_fifo_num; i++) {
+               mac_control->fifos[i].tx_fifo_stat =
+                               s2io_kzalloc(sizeof(struct txFifoStat));
+               if (!mac_control->fifos[i].tx_fifo_stat)
+                       return -ENOMEM;
+               sp->sw_dbg_stat->mem_allocated += sizeof(struct txFifoStat);
+       }
+       for (i = 0; i < sp->config.rx_ring_num; i++) {
+               mac_control->rings[i].rx_ring_stat =
+                               s2io_kzalloc(sizeof(struct rxRingStat));
+               if (!mac_control->rings[i].rx_ring_stat)
+                       return -ENOMEM;
+               sp->sw_dbg_stat->mem_allocated += sizeof(struct rxRingStat);
+       }
+       return SUCCESS;
+}
+
+static void free_ethtool_sw_stat(struct s2io_nic *sp)
+{
+       int i;
+       struct mac_info *mac_control = &sp->mac_control;
+       if (sp->xpak_stat)
+               kfree(sp->xpak_stat);
+
+       if (sp->sw_err_stat)
+               kfree(sp->sw_err_stat);
+
+       for (i = 0; i < sp->config.tx_fifo_num; i++)
+               kfree(mac_control->fifos[i].tx_fifo_stat);
+
+       for (i = 0; i < sp->config.rx_ring_num; i++)
+               kfree(mac_control->rings[i].rx_ring_stat);
+
+       if (sp->sw_dbg_stat)
+               kfree(sp->sw_dbg_stat);
+}
+
+
+static int alloc_init_fifo_mem(struct s2io_nic *nic)
+{
+       int i, j;
+       int lst_size, lst_per_page;
+       struct mac_info *mac_control;
+       struct config_param *config;
+       unsigned long long mem_allocated = 0;
+       struct list_info_hold *list_info = NULL;
+
+       mac_control = &nic->mac_control;
+       config = &nic->config;
 
        lst_size = (sizeof(struct TxD) * config->max_txds);
        lst_per_page = PAGE_SIZE / lst_size;
@@ -669,15 +1299,16 @@ static int init_shared_mem(struct s2io_nic *nic)
        for (i = 0; i < config->tx_fifo_num; i++) {
                int fifo_len = config->tx_cfg[i].fifo_len;
                int list_holder_size = fifo_len * sizeof(struct list_info_hold);
-               mac_control->fifos[i].list_info = kzalloc(list_holder_size,
+               mac_control->fifos[i].list_info = kmalloc(list_holder_size,
                                                          GFP_KERNEL);
                if (!mac_control->fifos[i].list_info) {
-                       DBG_PRINT(INFO_DBG,
-                                 "Malloc failed for list_info\n");
+                       DBG_PRINT(INFO_DBG, "Malloc failed for list_info\n");
                        return -ENOMEM;
                }
                mem_allocated += list_holder_size;
+               memset(mac_control->fifos[i].list_info, 0, list_holder_size);
        }
+
        for (i = 0; i < config->tx_fifo_num; i++) {
                int page_num = TXD_MEM_PAGE_CNT(config->tx_cfg[i].fifo_len,
                                                lst_per_page);
@@ -689,8 +1320,10 @@ static int init_shared_mem(struct s2io_nic *nic)
                    config->tx_cfg[i].fifo_len - 1;
                mac_control->fifos[i].fifo_no = i;
                mac_control->fifos[i].nic = nic;
-               mac_control->fifos[i].max_txds = MAX_SKB_FRAGS + 2;
-               mac_control->fifos[i].dev = dev;
+               mac_control->fifos[i].max_txds = MAX_SKB_FRAGS + 1;
+       #ifdef NETIF_F_UFO
+               mac_control->fifos[i].max_txds++;
+       #endif
 
                for (j = 0; j < page_num; j++) {
                        int k = 0;
@@ -699,28 +1332,26 @@ static int init_shared_mem(struct s2io_nic *nic)
                        tmp_v = pci_alloc_consistent(nic->pdev,
                                                     PAGE_SIZE, &tmp_p);
                        if (!tmp_v) {
-                               DBG_PRINT(INFO_DBG,
-                                         "pci_alloc_consistent ");
+                               DBG_PRINT(INFO_DBG, "pci_alloc_consistent ");
                                DBG_PRINT(INFO_DBG, "failed for TxDL\n");
                                return -ENOMEM;
                        }
+                       mem_allocated += PAGE_SIZE;
                        /* If we got a zero DMA address(can happen on
                         * certain platforms like PPC), reallocate.
-                        * Store virtual address of page we don't want,
-                        * to be freed later.
+                        * Free the virtual address of page we don't want.
                         */
                        if (!tmp_p) {
-                               mac_control->zerodma_virt_addr = tmp_v;
-                               DBG_PRINT(INIT_DBG,
-                               "%s: Zero DMA address for TxDL. ", dev->name);
-                               DBG_PRINT(INIT_DBG,
-                               "Virtual address %p\n", tmp_v);
+                               pci_free_consistent(nic->pdev, PAGE_SIZE,
+                                       tmp_v, (dma_addr_t)0);
+
                                tmp_v = pci_alloc_consistent(nic->pdev,
                                                     PAGE_SIZE, &tmp_p);
                                if (!tmp_v) {
                                        DBG_PRINT(INFO_DBG,
-                                         "pci_alloc_consistent ");
-                                       DBG_PRINT(INFO_DBG, "failed for TxDL\n");
+                                               "pci_alloc_consistent ");
+                                       DBG_PRINT(INFO_DBG,
+                                               "failed for TxDL\n");
                                        return -ENOMEM;
                                }
                                mem_allocated += PAGE_SIZE;
@@ -729,62 +1360,113 @@ static int init_shared_mem(struct s2io_nic *nic)
                                int l = (j * lst_per_page) + k;
                                if (l == config->tx_cfg[i].fifo_len)
                                        break;
-                               mac_control->fifos[i].list_info[l].list_virt_addr =
-                                   tmp_v + (k * lst_size);
-                               mac_control->fifos[i].list_info[l].list_phy_addr =
-                                   tmp_p + (k * lst_size);
+                               list_info =
+                                       &mac_control->fifos[i].list_info[l];
+                               list_info->list_virt_addr =
+                                       tmp_v + (k * lst_size);
+                               list_info->list_phy_addr =
+                                       tmp_p + (k * lst_size);
                                k++;
                        }
                }
        }
-
+       #ifdef NETIF_F_UFO
        for (i = 0; i < config->tx_fifo_num; i++) {
-               size = config->tx_cfg[i].fifo_len;
+               lst_size = config->tx_cfg[i].fifo_len;
                mac_control->fifos[i].ufo_in_band_v
-                       = kcalloc(size, sizeof(u64), GFP_KERNEL);
+                       = kcalloc(lst_size, sizeof(u64), GFP_KERNEL);
                if (!mac_control->fifos[i].ufo_in_band_v)
                        return -ENOMEM;
-               mem_allocated += (size * sizeof(u64));
+               mem_allocated += (lst_size * sizeof(u64));
        }
+       #endif
+
+       return mem_allocated;
+}
+
+static int alloc_init_ring_mem(struct s2io_nic *nic)
+{
+       u32 size;
+       void *tmp_v_addr, *tmp_v_addr_next;
+       dma_addr_t tmp_p_addr, tmp_p_addr_next;
+       struct RxD_block *pre_rxd_blk = NULL;
+       int i, j, blk_cnt, rx_sz;
+       unsigned long tmp;
+       struct buffAdd *ba;
+       struct mac_info *mac_control;
+       struct config_param *config;
+       unsigned long long mem_allocated = 0;
+       int total_rxds = 0;
+
+       mac_control = &nic->mac_control;
+       config = &nic->config;
 
        /* Allocation and initialization of RXDs in Rings */
        size = 0;
        for (i = 0; i < config->rx_ring_num; i++) {
-               if (config->rx_cfg[i].num_rxd %
-                   (rxd_count[nic->rxd_mode] + 1)) {
-                       DBG_PRINT(ERR_DBG, "%s: RxD count of ", dev->name);
-                       DBG_PRINT(ERR_DBG, "Ring%d is not a multiple of ",
-                                 i);
-                       DBG_PRINT(ERR_DBG, "RxDs per Block");
-                       return FAILURE;
-               }
                size += config->rx_cfg[i].num_rxd;
+               mac_control->rings[i].rx_blocks =
+                       kmalloc(rx_ring_sz[i] * sizeof(struct rx_block_info),
+                               GFP_KERNEL);
+               if (!mac_control->rings[i].rx_blocks)
+                       return -ENOMEM;
+               memset(mac_control->rings[i].rx_blocks, 0,
+                       sizeof(struct rx_block_info) * rx_ring_sz[i]);
+               mem_allocated += (rx_ring_sz[i] *
+                       sizeof(struct rx_block_info));
                mac_control->rings[i].block_count =
                        config->rx_cfg[i].num_rxd /
                        (rxd_count[nic->rxd_mode] + 1 );
                mac_control->rings[i].pkt_cnt = config->rx_cfg[i].num_rxd -
                        mac_control->rings[i].block_count;
        }
+
        if (nic->rxd_mode == RXD_MODE_1)
                size = (size * (sizeof(struct RxD1)));
+       else if (nic->rxd_mode == RXD_MODE_5)
+               size = (size * (sizeof(struct RxD5)));
        else
                size = (size * (sizeof(struct RxD3)));
+       rx_sz = size;
 
        for (i = 0; i < config->rx_ring_num; i++) {
                mac_control->rings[i].rx_curr_get_info.block_index = 0;
                mac_control->rings[i].rx_curr_get_info.offset = 0;
-               mac_control->rings[i].rx_curr_get_info.ring_len =
-                   config->rx_cfg[i].num_rxd - 1;
                mac_control->rings[i].rx_curr_put_info.block_index = 0;
                mac_control->rings[i].rx_curr_put_info.offset = 0;
-               mac_control->rings[i].rx_curr_put_info.ring_len =
-                   config->rx_cfg[i].num_rxd - 1;
                mac_control->rings[i].nic = nic;
                mac_control->rings[i].ring_no = i;
+               mac_control->rings[i].jiffies = jiffies;
+               mac_control->rings[i].interrupt_count = 0;
+               mac_control->rings[i].ufc_a = MIN_RX_UFC_A;
+               mac_control->rings[i].aggr_ack = 0;
+               mac_control->rings[i].max_pkts_aggr = 0;
                mac_control->rings[i].lro = lro_enable;
+               for (j = 0; j < MAX_LRO_SESSIONS; j++) {
+                       struct lro *l_lro = &mac_control->rings[i].lro0_n[j];
+                       l_lro->in_use = 0;
+                       l_lro->saw_ts = 0;
+                       l_lro->last_frag = NULL;
+               }
+               if ((config->intr_type == MSI_X) &&
+                       mac_control->rings[i].config_napi &&
+                       mac_control->rings[i].lro)
+                       mac_control->rings[i].aggr_ack = 1;
+
+               total_rxds = config->rx_cfg[i].num_rxd;
+               /* Allocate memory to hold the skb addresses */
+               if (nic->rxd_mode == RXD_MODE_5) {
+                       mac_control->rings[i].skbs =
+                               kmalloc(total_rxds * sizeof(u64), GFP_KERNEL);
+                       if (!mac_control->rings[i].skbs)
+                               return -ENOMEM;
+                       memset(mac_control->rings[i].skbs, 0,
+                               total_rxds * sizeof(u64));
+                       mem_allocated += (total_rxds * sizeof(u64));
+               }
+
+               blk_cnt = total_rxds/(rxd_count[nic->rxd_mode] + 1);
 
-               blk_cnt = config->rx_cfg[i].num_rxd /
-                               (rxd_count[nic->rxd_mode] + 1);
                /*  Allocating all the Rx blocks */
                for (j = 0; j < blk_cnt; j++) {
                        struct rx_block_info *rx_blocks;
@@ -813,9 +1495,9 @@ static int init_shared_mem(struct s2io_nic *nic)
                                                  GFP_KERNEL);
                        if (!rx_blocks->rxds)
                                return -ENOMEM;
-                       mem_allocated +=
-                       (sizeof(struct rxd_info)* rxd_count[nic->rxd_mode]);
-                       for (l=0; l<rxd_count[nic->rxd_mode];l++) {
+                       mem_allocated += (sizeof(struct rxd_info) *
+                               rxd_count[nic->rxd_mode]);
+                       for (l=0; l<rxd_count[nic->rxd_mode]; l++) {
                                rx_blocks->rxds[l].virt_addr =
                                        rx_blocks->block_virt_addr +
                                        (rxd_size[nic->rxd_mode] * l);
@@ -826,38 +1508,42 @@ static int init_shared_mem(struct s2io_nic *nic)
                }
                /* Interlinking all Rx Blocks */
                for (j = 0; j < blk_cnt; j++) {
-                       tmp_v_addr =
-                               mac_control->rings[i].rx_blocks[j].block_virt_addr;
+                       struct rx_block_info *rx_blocks;
+                       rx_blocks = &mac_control->rings[i].rx_blocks[j];
+                       tmp_v_addr = rx_blocks->block_virt_addr;
                        tmp_v_addr_next =
                                mac_control->rings[i].rx_blocks[(j + 1) %
-                                             blk_cnt].block_virt_addr;
-                       tmp_p_addr =
-                               mac_control->rings[i].rx_blocks[j].block_dma_addr;
+                                       blk_cnt].block_virt_addr;
+                       tmp_p_addr = rx_blocks->block_dma_addr;
                        tmp_p_addr_next =
                                mac_control->rings[i].rx_blocks[(j + 1) %
-                                             blk_cnt].block_dma_addr;
+                                       blk_cnt].block_dma_addr;
 
                        pre_rxd_blk = (struct RxD_block *) tmp_v_addr;
                        pre_rxd_blk->reserved_2_pNext_RxD_block =
-                           (unsigned long) tmp_v_addr_next;
+                               (unsigned long) tmp_v_addr_next;
                        pre_rxd_blk->pNext_RxD_Blk_physical =
-                           (u64) tmp_p_addr_next;
+                               (u64) tmp_p_addr_next;
                }
        }
-       if (nic->rxd_mode == RXD_MODE_3B) {
+
+       if (nic->rxd_mode >= RXD_MODE_3B) {
                /*
                 * Allocation of Storages for buffer addresses in 2BUFF mode
                 * and the buffers as well.
                 */
+               int hdrs_per_cache = L1_CACHE_BYTES / BUF0_LEN;
+               int hdr_index = 0;
+               void *prev_ba_0 = NULL;
                for (i = 0; i < config->rx_ring_num; i++) {
                        blk_cnt = config->rx_cfg[i].num_rxd /
                           (rxd_count[nic->rxd_mode]+ 1);
                        mac_control->rings[i].ba =
                                kmalloc((sizeof(struct buffAdd *) * blk_cnt),
-                                    GFP_KERNEL);
+                                       GFP_KERNEL);
                        if (!mac_control->rings[i].ba)
                                return -ENOMEM;
-                       mem_allocated +=(sizeof(struct buffAdd *) * blk_cnt);
+                       mem_allocated += (sizeof(struct buffAdd *) * blk_cnt);
                        for (j = 0; j < blk_cnt; j++) {
                                int k = 0;
                                mac_control->rings[i].ba[j] =
@@ -866,28 +1552,58 @@ static int init_shared_mem(struct s2io_nic *nic)
                                                GFP_KERNEL);
                                if (!mac_control->rings[i].ba[j])
                                        return -ENOMEM;
-                               mem_allocated += (sizeof(struct buffAdd) *  \
-                                       (rxd_count[nic->rxd_mode] + 1));
+
+                               mem_allocated += (sizeof(struct buffAdd) *
+                                               (rxd_count[nic->rxd_mode] + 1));
                                while (k != rxd_count[nic->rxd_mode]) {
                                        ba = &mac_control->rings[i].ba[j][k];
-
-                                       ba->ba_0_org = (void *) kmalloc
-                                           (BUF0_LEN + ALIGN_SIZE, GFP_KERNEL);
-                                       if (!ba->ba_0_org)
-                                               return -ENOMEM;
-                                       mem_allocated +=
-                                               (BUF0_LEN + ALIGN_SIZE);
-                                       tmp = (unsigned long)ba->ba_0_org;
-                                       tmp += ALIGN_SIZE;
-                                       tmp &= ~((unsigned long) ALIGN_SIZE);
-                                       ba->ba_0 = (void *) tmp;
+                                       if (L1_CACHE_BYTES > BUF0_LEN) {
+                                               if (hdr_index ==
+                                                       hdrs_per_cache) {
+                                                       prev_ba_0 = NULL;
+                                                       hdr_index = 0;
+                                               }
+                                               ba->ba_0_org = NULL;
+                                               if (hdr_index == 0) {
+                                                       ba->ba_0_org =
+                                                         (void *) kmalloc(2 *
+                                                               L1_CACHE_BYTES,
+                                                               GFP_KERNEL);
+                                                       if (!ba->ba_0_org)
+                                                               return -ENOMEM;
+                                                       mem_allocated += (2 *
+                                                         L1_CACHE_BYTES);
+                                                       ba->ba_0 = (void *)
+                                                        L1_CACHE_ALIGN(
+                                                         (unsigned long)
+                                                               ba->ba_0_org);
+                                               } else
+                                                       ba->ba_0 = prev_ba_0 +
+                                                               BUF0_LEN;
+                                               prev_ba_0 = ba->ba_0;
+                                               hdr_index++;
+                                       } else {
+                                               ba->ba_0_org = (void *) kmalloc
+                                                       (BUF0_LEN + ALIGN_SIZE,
+                                                               GFP_KERNEL);
+                                               if (!ba->ba_0_org)
+                                                       return -ENOMEM;
+                                               mem_allocated += (BUF0_LEN +
+                                                       ALIGN_SIZE);
+                                               tmp =
+                                                  (unsigned long)ba->ba_0_org;
+                                               tmp += ALIGN_SIZE;
+                                               tmp &=
+                                                ~((unsigned long) ALIGN_SIZE);
+                                               ba->ba_0 = (void *) tmp;
+                                       }
 
                                        ba->ba_1_org = (void *) kmalloc
-                                           (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL);
+                                         (BUF1_LEN + ALIGN_SIZE, GFP_KERNEL);
                                        if (!ba->ba_1_org)
                                                return -ENOMEM;
-                                       mem_allocated
-                                               += (BUF1_LEN + ALIGN_SIZE);
+                                       mem_allocated +=
+                                               (BUF1_LEN + ALIGN_SIZE);
                                        tmp = (unsigned long) ba->ba_1_org;
                                        tmp += ALIGN_SIZE;
                                        tmp &= ~((unsigned long) ALIGN_SIZE);
@@ -897,6 +1613,79 @@ static int init_shared_mem(struct s2io_nic *nic)
                        }
                }
        }
+       return mem_allocated;
+}
+
+
+/**
+ * init_shared_mem - Allocation and Initialization of Memory
+ * @nic: Device private variable.
+ * Description: The function allocates all the memory areas shared
+ * between the NIC and the driver. This includes Tx descriptors,
+ * Rx descriptors and the statistics block.
+ */
+
+static int init_shared_mem(struct s2io_nic *nic)
+{
+       int size;
+       void *tmp_v_addr = NULL;
+       int i;
+       struct net_device *dev = nic->dev;
+       struct mac_info *mac_control;
+       struct config_param *config;
+       unsigned long long mem_allocated = 0;
+
+       mac_control = &nic->mac_control;
+       config = &nic->config;
+
+       /* Allocation and initialization of TXDLs in FIOFs */
+       size = 0;
+       for (i = 0; i < config->tx_fifo_num; i++)
+               size += config->tx_cfg[i].fifo_len;
+
+       if (size > MAX_AVAILABLE_TXDS) {
+               DBG_PRINT(ERR_DBG, "s2io: Requested TxDs too high, ");
+               DBG_PRINT(ERR_DBG, "Requested: %d, max supported: 8192\n",
+                       size);
+               return -EINVAL;
+       }
+
+       for (i = 0; i < config->tx_fifo_num; i++) {
+               size = config->tx_cfg[i].fifo_len;
+               /*
+                * Legal values are from 2 to 8192
+                */
+               if (size < 2) {
+                       DBG_PRINT(ERR_DBG, "s2io: Invalid fifo len (%d) ",
+                               size);
+                       DBG_PRINT(ERR_DBG, "for fifo %d\n", i);
+                       DBG_PRINT(ERR_DBG, "s2io: Legal values for fifo len "
+                               "are 2 to 8192\n");
+                       return -EINVAL;
+               }
+       }
+
+       for (i = 0; i < config->rx_ring_num; i++) {
+               if (config->rx_cfg[i].num_rxd %
+                       (rxd_count[nic->rxd_mode] + 1)) {
+                       DBG_PRINT(ERR_DBG, "%s: RxD count of ", dev->name);
+                       DBG_PRINT(ERR_DBG, "Ring%d is not a multiple of ", i);
+                       DBG_PRINT(ERR_DBG, "RxDs per Block");
+                       return -EINVAL;
+               }
+       }
+
+       size = alloc_init_fifo_mem(nic);
+       if (size == -ENOMEM)
+               return size;
+
+       mem_allocated += size;
+
+       size = alloc_init_ring_mem(nic);
+       if (size == -ENOMEM)
+               return size;
+
+       mem_allocated += size;
 
        /* Allocation and initialization of Statistics block */
        size = sizeof(struct stat_block);
@@ -917,9 +1706,25 @@ static int init_shared_mem(struct s2io_nic *nic)
        tmp_v_addr = mac_control->stats_mem;
        mac_control->stats_info = (struct stat_block *) tmp_v_addr;
        memset(tmp_v_addr, 0, size);
-       DBG_PRINT(INIT_DBG, "%s:Ring Mem PHY: 0x%llx\n", dev->name,
-                 (unsigned long long) tmp_p_addr);
-       mac_control->stats_info->sw_stat.mem_allocated += mem_allocated;
+       if (alloc_ethtool_sw_stat(nic) != SUCCESS)
+               return -ENOMEM;
+
+       if ((config->tx_steering_type == TX_VLAN_STEERING) ||
+               (config->rx_steering_type == RX_VLAN_STEERING)) {
+               /* This memory should be allocated only if the steering option is set */
+               nic->vlan_array = (u16 *)
+                               kmalloc(VLAN_GROUP_ARRAY_LEN *
+                                       sizeof(u16), GFP_KERNEL);
+               if (nic->vlan_array)
+                       for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++)
+                               nic->vlan_array[i] = S2IO_INVALID_RING;
+               else
+                       return -ENOMEM;
+
+               mem_allocated += (VLAN_GROUP_ARRAY_LEN * sizeof(u16));
+       }
+
+       nic->sw_dbg_stat->mem_allocated += mem_allocated;
        return SUCCESS;
 }
 
@@ -938,14 +1743,11 @@ static void free_shared_mem(struct s2io_nic *nic)
        struct mac_info *mac_control;
        struct config_param *config;
        int lst_size, lst_per_page;
-       struct net_device *dev;
        int page_num = 0;
 
        if (!nic)
                return;
 
-       dev = nic->dev;
-
        mac_control = &nic->mac_control;
        config = &nic->config;
 
@@ -954,7 +1756,7 @@ static void free_shared_mem(struct s2io_nic *nic)
 
        for (i = 0; i < config->tx_fifo_num; i++) {
                page_num = TXD_MEM_PAGE_CNT(config->tx_cfg[i].fifo_len,
-                                                       lst_per_page);
+                                               lst_per_page);
                for (j = 0; j < page_num; j++) {
                        int mem_blks = (j * lst_per_page);
                        if (!mac_control->fifos[i].list_info)
@@ -969,31 +1771,19 @@ static void free_shared_mem(struct s2io_nic *nic)
                                            mac_control->fifos[i].
                                            list_info[mem_blks].
                                            list_phy_addr);
-                       nic->mac_control.stats_info->sw_stat.mem_freed
-                                               += PAGE_SIZE;
-               }
-               /* If we got a zero DMA address during allocation,
-                * free the page now
-                */
-               if (mac_control->zerodma_virt_addr) {
-                       pci_free_consistent(nic->pdev, PAGE_SIZE,
-                                           mac_control->zerodma_virt_addr,
-                                           (dma_addr_t)0);
-                       DBG_PRINT(INIT_DBG,
-                               "%s: Freeing TxDL with zero DMA addr. ",
-                               dev->name);
-                       DBG_PRINT(INIT_DBG, "Virtual address %p\n",
-                               mac_control->zerodma_virt_addr);
-                       nic->mac_control.stats_info->sw_stat.mem_freed
-                                               += PAGE_SIZE;
                }
+
                kfree(mac_control->fifos[i].list_info);
-               nic->mac_control.stats_info->sw_stat.mem_freed +=
-               (nic->config.tx_cfg[i].fifo_len *sizeof(struct list_info_hold));
        }
 
        size = SIZE_OF_BLOCK;
        for (i = 0; i < config->rx_ring_num; i++) {
+               if (nic->rxd_mode == RXD_MODE_5) {
+                       if (mac_control->rings[i].skbs)
+                               kfree(mac_control->rings[i].skbs);
+               }
+               if (!mac_control->rings[i].rx_blocks)
+                       break;
                blk_cnt = mac_control->rings[i].block_count;
                for (j = 0; j < blk_cnt; j++) {
                        tmp_v_addr = mac_control->rings[i].rx_blocks[j].
@@ -1004,62 +1794,124 @@ static void free_shared_mem(struct s2io_nic *nic)
                                break;
                        pci_free_consistent(nic->pdev, size,
                                            tmp_v_addr, tmp_p_addr);
-                       nic->mac_control.stats_info->sw_stat.mem_freed += size;
+                       if (NULL == mac_control->rings[i].rx_blocks[j].rxds)
+                               break;
                        kfree(mac_control->rings[i].rx_blocks[j].rxds);
-                       nic->mac_control.stats_info->sw_stat.mem_freed +=
-                       ( sizeof(struct rxd_info)* rxd_count[nic->rxd_mode]);
                }
+               kfree(mac_control->rings[i].rx_blocks);
        }
 
-       if (nic->rxd_mode == RXD_MODE_3B) {
+       if (nic->rxd_mode >= RXD_MODE_3B) {
                /* Freeing buffer storage addresses in 2BUFF mode. */
                for (i = 0; i < config->rx_ring_num; i++) {
                        blk_cnt = config->rx_cfg[i].num_rxd /
                            (rxd_count[nic->rxd_mode] + 1);
+                       if (!mac_control->rings[i].ba)
+                               break;
                        for (j = 0; j < blk_cnt; j++) {
                                int k = 0;
                                if (!mac_control->rings[i].ba[j])
                                        continue;
                                while (k != rxd_count[nic->rxd_mode]) {
                                        struct buffAdd *ba =
-                                               &mac_control->rings[i].ba[j][k];
-                                       kfree(ba->ba_0_org);
-                                       nic->mac_control.stats_info->sw_stat.\
-                                       mem_freed += (BUF0_LEN + ALIGN_SIZE);
-                                       kfree(ba->ba_1_org);
-                                       nic->mac_control.stats_info->sw_stat.\
-                                       mem_freed += (BUF1_LEN + ALIGN_SIZE);
+                                         &mac_control->rings[i].ba[j][k];
+                                       if (NULL == ba)
+                                               break;
+                                       if (ba->ba_0_org)
+                                               kfree(ba->ba_0_org);
+                                       if (ba->ba_1_org)
+                                               kfree(ba->ba_1_org);
                                        k++;
                                }
                                kfree(mac_control->rings[i].ba[j]);
-                               nic->mac_control.stats_info->sw_stat.mem_freed +=
-                                       (sizeof(struct buffAdd) *
-                                       (rxd_count[nic->rxd_mode] + 1));
                        }
                        kfree(mac_control->rings[i].ba);
-                       nic->mac_control.stats_info->sw_stat.mem_freed +=
-                       (sizeof(struct buffAdd *) * blk_cnt);
-               }
-       }
-
-       for (i = 0; i < nic->config.tx_fifo_num; i++) {
-               if (mac_control->fifos[i].ufo_in_band_v) {
-                       nic->mac_control.stats_info->sw_stat.mem_freed
-                               += (config->tx_cfg[i].fifo_len * sizeof(u64));
-                       kfree(mac_control->fifos[i].ufo_in_band_v);
                }
        }
 
        if (mac_control->stats_mem) {
-               nic->mac_control.stats_info->sw_stat.mem_freed +=
-                       mac_control->stats_mem_sz;
                pci_free_consistent(nic->pdev,
                                    mac_control->stats_mem_sz,
                                    mac_control->stats_mem,
                                    mac_control->stats_mem_phy);
        }
+
+#ifdef NETIF_F_UFO
+       for (i = 0; i < config->tx_fifo_num; i++) {
+               if (mac_control->fifos[i].ufo_in_band_v)
+                       kfree(mac_control->fifos[i].ufo_in_band_v);
+       }
+#endif
+       free_ethtool_sw_stat(nic);
+
+       if (nic->vlan_array)
+               kfree(nic->vlan_array);
+}
+
+#ifdef CONFIG_PM
+/**
+ * s2io_pm_suspend - s2io power management suspend entry point
+ *
+ */
+static int s2io_pm_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+       int ret = 0;
+       struct net_device *dev =  pci_get_drvdata(pdev);
+       struct s2io_nic *nic = dev->priv;
+
+       if (netif_running(dev)) {
+               s2io_card_down(nic);
+               netif_device_detach(dev);
+       }
+       if (nic->device_type == XFRAME_II_DEVICE) {
+               ret = pci_set_power_state(pdev, pci_choose_state(pdev, state));
+               if (ret)
+                       DBG_PRINT(ERR_DBG, "%s: Error %d setting power state\n",
+                               nic->dev->name, ret);
+       }
+       pci_disable_device(pdev);
+       return ret;
+}
+/**
+ * s2io_pm_resume - s2io power management resume entry point
+ *
+ */
+static int s2io_pm_resume(struct pci_dev *pdev)
+{
+       int ret = 0;
+       struct net_device *dev =  pci_get_drvdata(pdev);
+       struct s2io_nic *nic = dev->priv;
+
+       if (nic->device_type == XFRAME_II_DEVICE) {
+               ret = pci_set_power_state(pdev, PCI_D0);
+               if (ret) {
+                       DBG_PRINT(ERR_DBG, "%s: Error %d setting power state\n",
+                                       nic->dev->name, ret);
+                       return ret;
+               }
+       }
+       ret = pci_enable_device(pdev);
+       pci_set_master(pdev);
+       pci_restore_state(pdev, nic->config_space);
+#ifdef CONFIG_PCI_MSI
+       /* Restore the MSIX table entries from local variables */
+       restore_xmsi_data(nic);
+#endif
+
+       if (netif_running(dev)) {
+               ret = s2io_card_up(nic);
+               if (ret)
+                       DBG_PRINT(ERR_DBG, "%s: H/W initialization failed\n",
+                               dev->name);
+       }
+       netif_device_attach(dev);
+       s2io_start_all_tx_queue(nic);
+
+       return ret;
 }
 
+#endif
+
 /**
  * s2io_verify_pci_mode -
  */
@@ -1083,10 +1935,12 @@ static int s2io_verify_pci_mode(struct s2io_nic *nic)
 static int s2io_on_nec_bridge(struct pci_dev *s2io_pdev)
 {
        struct pci_dev *tdev = NULL;
-       while ((tdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, tdev)) != NULL) {
-               if (tdev->vendor == NEC_VENID && tdev->device == NEC_DEVID) {
+       while ((tdev = S2IO_PCI_FIND_DEVICE(PCI_ANY_ID,
+               PCI_ANY_ID, tdev)) != NULL) {
+               if ((tdev->vendor == NEC_VENID) &&
+                       (tdev->device == NEC_DEVID)) {
                        if (tdev->bus == s2io_pdev->bus->parent) {
-                               pci_dev_put(tdev);
+                               S2IO_PCI_PUT_DEVICE(tdev);
                                return 1;
                        }
                }
@@ -1094,7 +1948,7 @@ static int s2io_on_nec_bridge(struct pci_dev *s2io_pdev)
        return 0;
 }
 
-static int bus_speed[8] = {33, 133, 133, 200, 266, 133, 200, 266};
+static int bus_speed[8] = {33, 66, 66, 100, 133, 133, 200, 266};
 /**
  * s2io_print_pci_mode -
  */
@@ -1108,7 +1962,7 @@ static int s2io_print_pci_mode(struct s2io_nic *nic)
        val64 = readq(&bar0->pci_mode);
        mode = (u8)GET_PCI_MODE(val64);
 
-       if ( val64 & PCI_MODE_UNKNOWN_MODE)
+       if (val64 & PCI_MODE_UNKNOWN_MODE)
                return -1;      /* Unknown PCI mode */
 
        config->bus_speed = bus_speed[mode];
@@ -1125,7 +1979,7 @@ static int s2io_print_pci_mode(struct s2io_nic *nic)
                DBG_PRINT(ERR_DBG, "%s: Device is on 64 bit ", nic->dev->name);
        }
 
-       switch(mode) {
+       switch (mode) {
                case PCI_MODE_PCI_33:
                        DBG_PRINT(ERR_DBG, "33MHz PCI bus\n");
                        break;
@@ -1157,6 +2011,149 @@ static int s2io_print_pci_mode(struct s2io_nic *nic)
        return mode;
 }
 
+/**
+ *     rts_ds_steer - Receive traffic steering based on IPv4 or IPv6 TOS
+ *     or Traffic class respectively.
+ *     @nic: device private variable
+ *     Description: The function configures the receive steering to
+ *     desired receive ring.
+ *     Return Value:  SUCCESS on success and
+ *     '-1' on failure (endian settings incorrect).
+ */
+static int rts_ds_steer(struct s2io_nic *nic, u8 ds_codepoint, u8 ring)
+{
+       struct XENA_dev_config __iomem *bar0 = nic->bar0;
+       register u64 val64 = 0;
+
+       if (ds_codepoint > 63)
+               return FAILURE;
+
+       val64 = S2BIT(ring);
+
+       writeq(val64, &bar0->rts_ds_mem_data);
+
+       val64 = RTS_DS_MEM_CTRL_WE |
+                       RTS_DS_MEM_CTRL_STROBE_NEW_CMD|
+                       RTS_DS_MEM_CTRL_OFFSET(ds_codepoint);
+
+       writeq(val64, &bar0->rts_ds_mem_ctrl);
+
+       return wait_for_cmd_complete(&bar0->rts_ds_mem_ctrl,
+                               RTS_DS_MEM_CTRL_STROBE_CMD_BEING_EXECUTED,
+                               S2IO_BIT_RESET);
+}
+
+/**
+ *  init_rti - Initialization receive traffic interrupt scheme
+ *  @nic: device private variable
+ *  Description: The function configures receive traffic interrupts
+ *  Return Value:  SUCCESS on success and
+ *  '-1' on failure
+ */
+
+static int init_rti(struct s2io_nic *nic)
+{
+       struct XENA_dev_config __iomem *bar0 = nic->bar0;
+       register u64 val64 = 0;
+       int i, timer_interval = 0;
+       struct config_param *config;
+       struct mac_info *mac_control;
+       int udp_ring = 0;
+
+       config = &nic->config;
+       mac_control = &nic->mac_control;
+
+       if (nic->device_type == XFRAME_II_DEVICE) {
+               /*
+                * Programmed to generate Apprx 250 Intrs per
+                * second
+                */
+               timer_interval = (nic->config.bus_speed * 125)/4;
+       } else
+               timer_interval = 0xFFF;
+
+       /* RTI Initialization */
+       for (i = 0; i < config->rx_ring_num; i++) {
+               val64 = RTI_DATA1_MEM_RX_TIMER_VAL(timer_interval);
+               mac_control->rings[i].rx_timer_val = timer_interval;
+               mac_control->rings[i].rx_timer_val_saved = timer_interval;
+
+               if (nic->device_type == XFRAME_I_DEVICE)
+                       udp_ring = 0; /* Set TCP settings for XENA rings */
+               else if (rx_steering_type == NO_STEERING)
+                       udp_ring = 0; /* Set TCP settings as default */
+               else if (rx_steering_type == RX_TOS_STEERING)
+                       udp_ring = 0; /* Set TCP settings as default */
+               else if (rth_protocol == 2)
+                       udp_ring = 1; /* Set UDP settings all rings */
+               else if ((rth_protocol == 1) && rx_ring_num)
+                       udp_ring = 0; /* Set TCP settings all rings */
+               else if ((config->rx_ring_num > 1) && (0 == i))
+                       udp_ring = 1; /* Set UDP settings for ring 0 */
+               else
+                       udp_ring = 0; /* Set TCP settings for other rings */
+
+               if (udp_ring) {
+                       val64 |= RTI_DATA1_MEM_RX_URNG_A(1);
+                       mac_control->rings[i].urange_a = 1;
+               } else {
+                       val64 |= RTI_DATA1_MEM_RX_URNG_A(0xA);
+                       mac_control->rings[i].urange_a = 0xA;
+               }
+
+               val64 |= RTI_DATA1_MEM_RX_URNG_B(0x10) |
+                       RTI_DATA1_MEM_RX_URNG_C(0x30) |
+                       RTI_DATA1_MEM_RX_TIMER_AC_EN;
+
+               mac_control->rings[i].urange_b = 0x10;
+               mac_control->rings[i].urange_c = 0x30;
+               writeq(val64, &bar0->rti_data1_mem);
+
+               if (udp_ring) {
+                       val64 = RTI_DATA2_MEM_RX_UFC_A(1) |
+                               RTI_DATA2_MEM_RX_UFC_B(0x40) ;
+                       mac_control->rings[i].ufc_a = 1;
+                       mac_control->rings[i].ufc_b = 0x40;
+               } else {
+                       val64 = RTI_DATA2_MEM_RX_UFC_A(1) |
+                               RTI_DATA2_MEM_RX_UFC_B(2) ;
+                       mac_control->rings[i].ufc_a = 1;
+                       mac_control->rings[i].ufc_b = 2;
+               }
+
+               if (config->intr_type == MSI_X) {
+                       if (udp_ring) {
+                               val64 |= (RTI_DATA2_MEM_RX_UFC_C(0x60) | \
+                                       RTI_DATA2_MEM_RX_UFC_D(0x80));
+                               mac_control->rings[i].ufc_c = 0x60;
+                               mac_control->rings[i].ufc_d = 0x80;
+                       } else {
+                               val64 |= (RTI_DATA2_MEM_RX_UFC_C(0x20) | \
+                                       RTI_DATA2_MEM_RX_UFC_D(0x40));
+                               mac_control->rings[i].ufc_c = 0x20;
+                               mac_control->rings[i].ufc_d = 0x40;
+                       }
+               }
+               else {
+                       val64 |= (RTI_DATA2_MEM_RX_UFC_C(0x40) | \
+                               RTI_DATA2_MEM_RX_UFC_D(0x80));
+                       mac_control->rings[i].ufc_c = 0x40;
+                       mac_control->rings[i].ufc_d = 0x80;
+               }
+               writeq(val64, &bar0->rti_data2_mem);
+
+               val64 = RTI_CMD_MEM_WE | RTI_CMD_MEM_STROBE_NEW_CMD
+                               | RTI_CMD_MEM_OFFSET(i);
+               writeq(val64, &bar0->rti_command_mem);
+
+               if (wait_for_cmd_complete(&bar0->rti_command_mem,
+                       RTI_CMD_MEM_STROBE_NEW_CMD, S2IO_BIT_RESET) != SUCCESS)
+                       return FAILURE;
+       }
+
+       return SUCCESS;
+}
+
 /**
  *  init_tti - Initialization transmit traffic interrupt scheme
  *  @nic: device private variable
@@ -1166,7 +2163,6 @@ static int s2io_print_pci_mode(struct s2io_nic *nic)
  *  Return Value:  SUCCESS on success and
  *  '-1' on failure
  */
-
 static int init_tti(struct s2io_nic *nic, int link)
 {
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
@@ -1188,27 +2184,30 @@ static int init_tti(struct s2io_nic *nic, int link)
                } else
                        val64 = TTI_DATA1_MEM_TX_TIMER_VAL(0x2078);
 
+               /*
+                * We will use different interrupt schemes when there are more
+                * than 5 fifos configured
+               */
                val64 |= TTI_DATA1_MEM_TX_URNG_A(0xA) |
                                TTI_DATA1_MEM_TX_URNG_B(0x10) |
                                TTI_DATA1_MEM_TX_URNG_C(0x30) |
                                TTI_DATA1_MEM_TX_TIMER_AC_EN;
+
                if (i == 0)
                        if (use_continuous_tx_intrs && (link == LINK_UP))
                                val64 |= TTI_DATA1_MEM_TX_TIMER_CI_EN;
+
                writeq(val64, &bar0->tti_data1_mem);
 
-               if (nic->config.intr_type == MSI_X) {
+               if (nic->config.intr_type == MSI_X){
                        val64 = TTI_DATA2_MEM_TX_UFC_A(0x10) |
                                TTI_DATA2_MEM_TX_UFC_B(0x100) |
                                TTI_DATA2_MEM_TX_UFC_C(0x200) |
                                TTI_DATA2_MEM_TX_UFC_D(0x300);
-               } else {
-                       if ((nic->config.tx_steering_type ==
-                               TX_DEFAULT_STEERING) &&
-                               (config->tx_fifo_num > 1) &&
-                               (i >= nic->udp_fifo_idx) &&
-                               (i < (nic->udp_fifo_idx +
-                               nic->total_udp_fifos)))
+               }
+               else {
+                       if ((config->tx_fifo_num > 1) && (i >= nic->udp_fifo_idx) &&
+                               (i < (nic->udp_fifo_idx + nic->total_udp_fifos)))
                                val64 = TTI_DATA2_MEM_TX_UFC_A(0x50) |
                                        TTI_DATA2_MEM_TX_UFC_B(0x80) |
                                        TTI_DATA2_MEM_TX_UFC_C(0x100) |
@@ -1219,7 +2218,6 @@ static int init_tti(struct s2io_nic *nic, int link)
                                        TTI_DATA2_MEM_TX_UFC_C(0x40) |
                                        TTI_DATA2_MEM_TX_UFC_D(0x80);
                }
-
                writeq(val64, &bar0->tti_data2_mem);
 
                val64 = TTI_CMD_MEM_WE | TTI_CMD_MEM_STROBE_NEW_CMD |
@@ -1236,7 +2234,7 @@ static int init_tti(struct s2io_nic *nic, int link)
 
 /**
  *  init_nic - Initialization of hardware
- *  @nic: device private variable
+ *  @nic: device peivate variable
  *  Description: The function sequentially configures every block
  *  of the H/W from their reset values.
  *  Return Value:  SUCCESS on success and
@@ -1249,7 +2247,6 @@ static int init_nic(struct s2io_nic *nic)
        struct net_device *dev = nic->dev;
        register u64 val64 = 0;
        void __iomem *add;
-       u32 time;
        int i, j;
        struct mac_info *mac_control;
        struct config_param *config;
@@ -1261,7 +2258,7 @@ static int init_nic(struct s2io_nic *nic)
        config = &nic->config;
 
        /* to set the swapper controle on the card */
-       if(s2io_set_swapper(nic)) {
+       if (s2io_set_swapper(nic)) {
                DBG_PRINT(ERR_DBG,"ERROR: Setting Swapper failed\n");
                return -EIO;
        }
@@ -1269,7 +2266,7 @@ static int init_nic(struct s2io_nic *nic)
        /*
         * Herc requires EOI to be removed from reset before XGXS, so..
         */
-       if (nic->device_type & XFRAME_II_DEVICE) {
+       if (nic->device_type == XFRAME_II_DEVICE) {
                val64 = 0xA500000000ULL;
                writeq(val64, &bar0->sw_reset);
                msleep(500);
@@ -1286,7 +2283,7 @@ static int init_nic(struct s2io_nic *nic)
         * RIC_RUNNING bit is reset. Check is valid only for XframeII.
         */
        if (nic->device_type == XFRAME_II_DEVICE) {
-               for (i = 0; i < 50; i++) {
+               for (i=0; i < 50; i++) {
                        val64 = readq(&bar0->adapter_status);
                        if (!(val64 & ADAPTER_STATUS_RIC_RUNNING))
                                break;
@@ -1314,10 +2311,10 @@ static int init_nic(struct s2io_nic *nic)
        val64 = dev->mtu;
        writeq(vBIT(val64, 2, 14), &bar0->rmac_max_pyld_len);
 
-       if (nic->device_type & XFRAME_II_DEVICE) {
+       if (nic->device_type == XFRAME_II_DEVICE) {
                while (herc_act_dtx_cfg[dtx_cnt] != END_SIGN) {
                        SPECIAL_REG_WRITE(herc_act_dtx_cfg[dtx_cnt],
-                                         &bar0->dtx_control, UF);
+                                       &bar0->dtx_control, UF);
                        if (dtx_cnt & 0x1)
                                msleep(1); /* Necessary!! */
                        dtx_cnt++;
@@ -1338,12 +2335,11 @@ static int init_nic(struct s2io_nic *nic)
        writeq(val64, &bar0->tx_fifo_partition_2);
        writeq(val64, &bar0->tx_fifo_partition_3);
 
-
        for (i = 0, j = 0; i < config->tx_fifo_num; i++) {
                val64 |=
-                   vBIT(config->tx_cfg[i].fifo_len - 1, ((j * 32) + 19),
-                        13) | vBIT(config->tx_cfg[i].fifo_priority,
-                                   ((j * 32) + 5), 3);
+                       vBIT(config->tx_cfg[i].fifo_len - 1, ((j * 32) + 19),
+                               13) | vBIT(config->tx_cfg[i].fifo_priority,
+                               ((j * 32) + 5), 3);
 
                if (i == (config->tx_fifo_num - 1)) {
                        if (i % 2 == 0)
@@ -1382,7 +2378,7 @@ static int init_nic(struct s2io_nic *nic)
         * SXE-008 TRANSMIT DMA ARBITRATION ISSUE.
         */
        if ((nic->device_type == XFRAME_I_DEVICE) &&
-               (nic->pdev->revision < 4))
+               (get_xena_rev_id(nic->pdev) < 4))
                writeq(PCC_ENABLE_FOUR, &bar0->pcc_enable);
 
        val64 = readq(&bar0->tx_fifo_partition_0);
@@ -1395,16 +2391,16 @@ static int init_nic(struct s2io_nic *nic)
         */
        val64 = readq(&bar0->tx_pa_cfg);
        val64 |= TX_PA_CFG_IGNORE_FRM_ERR | TX_PA_CFG_IGNORE_SNAP_OUI |
-           TX_PA_CFG_IGNORE_LLC_CTRL | TX_PA_CFG_IGNORE_L2_ERR;
+               TX_PA_CFG_IGNORE_LLC_CTRL | TX_PA_CFG_IGNORE_L2_ERR;
        writeq(val64, &bar0->tx_pa_cfg);
 
        /* Rx DMA intialization. */
        val64 = 0;
-       for (i = 0; i < config->rx_ring_num; i++) {
+       for (i = 0; i < config->rx_ring_num; i++)
                val64 |=
-                   vBIT(config->rx_cfg[i].ring_priority, (5 + (i * 8)),
-                        3);
-       }
+                       vBIT(config->rx_cfg[i].ring_priority,
+                               (5 + (i * 8)), 3);
+
        writeq(val64, &bar0->rx_queue_priority);
 
        /*
@@ -1412,7 +2408,7 @@ static int init_nic(struct s2io_nic *nic)
         * configured Rings.
         */
        val64 = 0;
-       if (nic->device_type & XFRAME_II_DEVICE)
+       if (nic->device_type == XFRAME_II_DEVICE)
                mem_size = 32;
        else
                mem_size = 64;
@@ -1421,7 +2417,7 @@ static int init_nic(struct s2io_nic *nic)
                switch (i) {
                case 0:
                        mem_share = (mem_size / config->rx_ring_num +
-                                    mem_size % config->rx_ring_num);
+                               mem_size % config->rx_ring_num);
                        val64 |= RX_QUEUE_CFG_Q0_SZ(mem_share);
                        continue;
                case 1:
@@ -1458,7 +2454,7 @@ static int init_nic(struct s2io_nic *nic)
 
        /*
         * Filling Tx round robin registers
-        * as per the number of FIFOs for equal scheduling priority
+        * as per the number of FIFOs
         */
        switch (config->tx_fifo_num) {
        case 1:
@@ -1552,9 +2548,16 @@ static int init_nic(struct s2io_nic *nic)
        writeq(val64, &bar0->tx_fifo_partition_0);
 
        /* Filling the Rx round robin registers as per the
-        * number of Rings and steering based on QoS with
-        * equal priority.
-        */
+        * number of Rings and steering based on QoS.
+       */
+
+       /*
+        * Classic mode: Specify which queues a frame with a particular
+        *              QoS value may be steered to
+        * Enhanced mode: Maps QoS to a priority level which is
+        *              then mapped to a queue
+       */
+
        switch (config->rx_ring_num) {
        case 1:
                val64 = 0x0;
@@ -1564,8 +2567,17 @@ static int init_nic(struct s2io_nic *nic)
                writeq(val64, &bar0->rx_w_round_robin_3);
                writeq(val64, &bar0->rx_w_round_robin_4);
 
-               val64 = 0x8080808080808080ULL;
+               if (config->rx_steering_type  &&
+                       config->rx_steering_type != RX_TOS_STEERING) {
+                       val64 = 0x0180018001800180ULL;
+                       writeq(val64, &bar0->rts_p0_p3_map);
+                       val64 = 0x0180018001800180ULL;
+                       writeq(val64, &bar0->rts_p4_p7_map);
+                       val64 = 0x00ULL;
+               } else
+                       val64 = 0x8080808080808080ULL;
                writeq(val64, &bar0->rts_qos_steering);
+
                break;
        case 2:
                val64 = 0x0001000100010001ULL;
@@ -1576,8 +2588,17 @@ static int init_nic(struct s2io_nic *nic)
                val64 = 0x0001000100000000ULL;
                writeq(val64, &bar0->rx_w_round_robin_4);
 
-               val64 = 0x8080808040404040ULL;
+               if (config->rx_steering_type  &&
+                       config->rx_steering_type != RX_TOS_STEERING) {
+                       val64 = 0x0180018001800180ULL;
+                       writeq(val64, &bar0->rts_p0_p3_map);
+                       val64 = 0x0140014001400140ULL;
+                       writeq(val64, &bar0->rts_p4_p7_map);
+                       val64 = 0x0000000001010101ULL;
+               } else
+                       val64 = 0x8080808040404040ULL;
                writeq(val64, &bar0->rts_qos_steering);
+
                break;
        case 3:
                val64 = 0x0001020001020001ULL;
@@ -1591,8 +2612,17 @@ static int init_nic(struct s2io_nic *nic)
                val64 = 0x0200010200000000ULL;
                writeq(val64, &bar0->rx_w_round_robin_4);
 
-               val64 = 0x8080804040402020ULL;
+               if (config->rx_steering_type  &&
+                       config->rx_steering_type != RX_TOS_STEERING) {
+                       val64 = 0x0180018001800140ULL;
+                       writeq(val64, &bar0->rts_p0_p3_map);
+                       val64 = 0x0140014001200120ULL;
+                       writeq(val64, &bar0->rts_p4_p7_map);
+                       val64 = 0x0000000101010202ULL;
+               } else
+                       val64 = 0x8080804040402020ULL;
                writeq(val64, &bar0->rts_qos_steering);
+
                break;
        case 4:
                val64 = 0x0001020300010203ULL;
@@ -1603,8 +2633,17 @@ static int init_nic(struct s2io_nic *nic)
                val64 = 0x0001020300000000ULL;
                writeq(val64, &bar0->rx_w_round_robin_4);
 
-               val64 = 0x8080404020201010ULL;
+               if (config->rx_steering_type  &&
+                       config->rx_steering_type != RX_TOS_STEERING) {
+                       val64 = 0x0180018001400140ULL;
+                       writeq(val64, &bar0->rts_p0_p3_map);
+                       val64 = 0x0120012001100110ULL;
+                       writeq(val64, &bar0->rts_p4_p7_map);
+                       val64 = 0x0000010102020303ULL;
+               } else
+                       val64 = 0x8080404020201010ULL;
                writeq(val64, &bar0->rts_qos_steering);
+
                break;
        case 5:
                val64 = 0x0001020304000102ULL;
@@ -1618,8 +2657,17 @@ static int init_nic(struct s2io_nic *nic)
                val64 = 0x0203040000000000ULL;
                writeq(val64, &bar0->rx_w_round_robin_4);
 
-               val64 = 0x8080404020201008ULL;
+               if (config->rx_steering_type  &&
+                       config->rx_steering_type != RX_TOS_STEERING) {
+                       val64 = 0x0180018001400140ULL;
+                       writeq(val64, &bar0->rts_p0_p3_map);
+                       val64 = 0x0120012001100108ULL;
+                       writeq(val64, &bar0->rts_p4_p7_map);
+                       val64 = 0x0000010102020304ULL;
+               } else
+                       val64 = 0x8080404020201008ULL;
                writeq(val64, &bar0->rts_qos_steering);
+
                break;
        case 6:
                val64 = 0x0001020304050001ULL;
@@ -1633,8 +2681,17 @@ static int init_nic(struct s2io_nic *nic)
                val64 = 0x0203040500000000ULL;
                writeq(val64, &bar0->rx_w_round_robin_4);
 
-               val64 = 0x8080404020100804ULL;
+               if (config->rx_steering_type  &&
+                       config->rx_steering_type != RX_TOS_STEERING) {
+                       val64 = 0x0180018001400140ULL;
+                       writeq(val64, &bar0->rts_p0_p3_map);
+                       val64 = 0x0120011001080104ULL;
+                       writeq(val64, &bar0->rts_p4_p7_map);
+                       val64 = 0x0000010102030405ULL;
+               } else
+                       val64 = 0x8080404020100804ULL;
                writeq(val64, &bar0->rts_qos_steering);
+
                break;
        case 7:
                val64 = 0x0001020304050600ULL;
@@ -1648,8 +2705,17 @@ static int init_nic(struct s2io_nic *nic)
                val64 = 0x0405060000000000ULL;
                writeq(val64, &bar0->rx_w_round_robin_4);
 
-               val64 = 0x8080402010080402ULL;
+               if (config->rx_steering_type  &&
+                       config->rx_steering_type != RX_TOS_STEERING) {
+                       val64 = 0x0180018001400120ULL;
+                       writeq(val64, &bar0->rts_p0_p3_map);
+                       val64 = 0x0110010801040102ULL;
+                       writeq(val64, &bar0->rts_p4_p7_map);
+                       val64 = 0x0000010203040506ULL;
+               } else
+                       val64 = 0x8080402010080402ULL;
                writeq(val64, &bar0->rts_qos_steering);
+
                break;
        case 8:
                val64 = 0x0001020304050607ULL;
@@ -1660,8 +2726,17 @@ static int init_nic(struct s2io_nic *nic)
                val64 = 0x0001020300000000ULL;
                writeq(val64, &bar0->rx_w_round_robin_4);
 
-               val64 = 0x8040201008040201ULL;
+               if (config->rx_steering_type  &&
+                       config->rx_steering_type != RX_TOS_STEERING) {
+                       val64 = 0x0180014001200110ULL;
+                       writeq(val64, &bar0->rts_p0_p3_map);
+                       val64 = 0x0108010401020101ULL;
+                       writeq(val64, &bar0->rts_p4_p7_map);
+                       val64 = 0x0001020304050607ULL;
+               } else
+                       val64 = 0x8040201008040201ULL;
                writeq(val64, &bar0->rts_qos_steering);
+
                break;
        }
 
@@ -1672,7 +2747,7 @@ static int init_nic(struct s2io_nic *nic)
 
        /* Set the default rts frame length for the rings configured */
        val64 = MAC_RTS_FRM_LEN_SET(dev->mtu+22);
-       for (i = 0 ; i < config->rx_ring_num ; i++)
+       for (i = 0; i < config->rx_ring_num; i++)
                writeq(val64, &bar0->rts_frm_len_n[i]);
 
        /* Set the frame length for the configured rings
@@ -1685,20 +2760,40 @@ static int init_nic(struct s2io_nic *nic)
                 * the rts_frm_len register for those values or else
                 * leave it as it is.
                 */
-               if (rts_frm_len[i] != 0) {
+               if (rts_frm_len[i] != 0)
                        writeq(MAC_RTS_FRM_LEN_SET(rts_frm_len[i]),
                                &bar0->rts_frm_len_n[i]);
-               }
        }
 
-       /* Disable differentiated services steering logic */
-       for (i = 0; i < 64; i++) {
+       /*
+        * Disable differentiated services steering logic
+        */
+       for (i = 0; i < 64; i++)
                if (rts_ds_steer(nic, i, 0) == FAILURE) {
                        DBG_PRINT(ERR_DBG, "%s: failed rts ds steering",
                                dev->name);
                        DBG_PRINT(ERR_DBG, "set on codepoint %d\n", i);
                        return -ENODEV;
                }
+
+       /*
+       * Configuring DS steering
+       * MAP DS codepoints 0-7 to ring0-last ring, and codepoints 8-63 to last ring
+       */
+       if (config->rx_steering_type == RX_TOS_STEERING) {
+           int ring_num = 0;
+           for (i = 0; i < 64; i++) {
+               ring_num = (i < 8) ? i : 7;
+               if (ring_num >= config->rx_ring_num)
+                       ring_num = config->rx_ring_num - 1;
+
+                       if (rts_ds_steer(nic, i, ring_num) == FAILURE) {
+                               DBG_PRINT(ERR_DBG, "%s: failed rts ds steering",
+                                       dev->name);
+                               DBG_PRINT(ERR_DBG, "set on codepoint %d\n", i);
+                               return -ENODEV;
+                       }
+           }
        }
 
        /* Program statistics memory */
@@ -1726,57 +2821,20 @@ static int init_nic(struct s2io_nic *nic)
        if (SUCCESS != init_tti(nic, nic->last_link_state))
                return -ENODEV;
 
-       /* RTI Initialization */
-       if (nic->device_type == XFRAME_II_DEVICE) {
-               /*
-                * Programmed to generate Apprx 500 Intrs per
-                * second
-                */
-               int count = (nic->config.bus_speed * 125)/4;
-               val64 = RTI_DATA1_MEM_RX_TIMER_VAL(count);
-       } else
-               val64 = RTI_DATA1_MEM_RX_TIMER_VAL(0xFFF);
-       val64 |= RTI_DATA1_MEM_RX_URNG_A(0xA) |
-                RTI_DATA1_MEM_RX_URNG_B(0x10) |
-                RTI_DATA1_MEM_RX_URNG_C(0x30) | RTI_DATA1_MEM_RX_TIMER_AC_EN;
-
-       writeq(val64, &bar0->rti_data1_mem);
-
-       val64 = RTI_DATA2_MEM_RX_UFC_A(0x1) |
-               RTI_DATA2_MEM_RX_UFC_B(0x2) ;
-       if (nic->config.intr_type == MSI_X)
-           val64 |= (RTI_DATA2_MEM_RX_UFC_C(0x20) | \
-                       RTI_DATA2_MEM_RX_UFC_D(0x40));
-       else
-           val64 |= (RTI_DATA2_MEM_RX_UFC_C(0x40) | \
-                       RTI_DATA2_MEM_RX_UFC_D(0x80));
-       writeq(val64, &bar0->rti_data2_mem);
-
-       for (i = 0; i < config->rx_ring_num; i++) {
-               val64 = RTI_CMD_MEM_WE | RTI_CMD_MEM_STROBE_NEW_CMD
-                               | RTI_CMD_MEM_OFFSET(i);
-               writeq(val64, &bar0->rti_command_mem);
+       /* Initialize RTI */
+       if (SUCCESS != init_rti(nic))
+               return -ENODEV;
 
-               /*
-                * Once the operation completes, the Strobe bit of the
-                * command register will be reset. We poll for this
-                * particular condition. We wait for a maximum of 500ms
-                * for the operation to complete, if it's not complete
-                * by then we return error.
-                */
-               time = 0;
-               while (TRUE) {
-                       val64 = readq(&bar0->rti_command_mem);
-                       if (!(val64 & RTI_CMD_MEM_STROBE_NEW_CMD))
-                               break;
+       /* Configure RTH */
+       if ((config->rx_steering_type) &&
+               (config->rx_steering_type != RX_TOS_STEERING))
+               s2io_rth_configure(nic);
 
-                       if (time > 10) {
-                               DBG_PRINT(ERR_DBG, "%s: RTI init Failed\n",
-                                         dev->name);
-                               return -ENODEV;
-                       }
-                       time++;
-                       msleep(50);
+       /* Configure VLAN ID steering */
+       if (config->rx_steering_type == RX_VLAN_STEERING) {
+               for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
+                       if (S2IO_INVALID_RING != nic->vlan_array[i])
+                               rts_vid_steer(nic, i, nic->vlan_array[i], 1);
                }
        }
 
@@ -1863,10 +2921,10 @@ static int init_nic(struct s2io_nic *nic)
         */
        if (nic->device_type == XFRAME_II_DEVICE) {
                val64 = FAULT_BEHAVIOUR | EXT_REQ_EN |
-                       MISC_LINK_STABILITY_PRD(3);
+                                MISC_LINK_STABILITY_PRD(3);
                writeq(val64, &bar0->misc_control);
                val64 = readq(&bar0->pic_control2);
-               val64 &= ~(s2BIT(13)|s2BIT(14)|s2BIT(15));
+               val64 &= ~(S2BIT(13)|S2BIT(14)|S2BIT(15));
                writeq(val64, &bar0->pic_control2);
        }
        if (strstr(nic->product_name, "CX4")) {
@@ -1874,6 +2932,7 @@ static int init_nic(struct s2io_nic *nic)
                writeq(val64, &bar0->tmac_avg_ipg);
        }
 
+       nic->spdm_entry = 0;
        return SUCCESS;
 }
 #define LINK_UP_DOWN_INTERRUPT         1
@@ -1881,6 +2940,8 @@ static int init_nic(struct s2io_nic *nic)
 
 static int s2io_link_fault_indication(struct s2io_nic *nic)
 {
+       if (nic->config.intr_type != INTA)
+               return MAC_RMAC_ERR_TIMER;
        if (nic->device_type == XFRAME_II_DEVICE)
                return LINK_UP_DOWN_INTERRUPT;
        else
@@ -1902,7 +2963,7 @@ static void do_s2io_write_bits(u64 value, int flag, void __iomem *addr)
 
        temp64 = readq(addr);
 
-       if(flag == ENABLE_INTRS)
+       if (flag == ENABLE_INTRS)
                temp64 &= ~((u64) value);
        else
                temp64 |= ((u64) value);
@@ -1913,9 +2974,7 @@ static void en_dis_err_alarms(struct s2io_nic *nic, u16 mask, int flag)
 {
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
        register u64 gen_int_mask = 0;
-       u64 interruptible;
 
-       writeq(DISABLE_ALL_INTRS, &bar0->general_int_mask);
        if (mask & TX_DMA_INTR) {
 
                gen_int_mask |= TXDMA_INT_M;
@@ -2005,17 +3064,14 @@ static void en_dis_err_alarms(struct s2io_nic *nic, u16 mask, int flag)
                gen_int_mask |= RXMAC_INT_M;
                do_s2io_write_bits(MAC_INT_STATUS_RMAC_INT, flag,
                                &bar0->mac_int_mask);
-               interruptible = RMAC_RX_BUFF_OVRN | RMAC_RX_SM_ERR |
+               do_s2io_write_bits(RMAC_RX_BUFF_OVRN | RMAC_RX_SM_ERR |
                                RMAC_UNUSED_INT | RMAC_SINGLE_ECC_ERR |
-                               RMAC_DOUBLE_ECC_ERR;
-               if (s2io_link_fault_indication(nic) == MAC_RMAC_ERR_TIMER)
-                       interruptible |= RMAC_LINK_STATE_CHANGE_INT;
-               do_s2io_write_bits(interruptible,
+                               RMAC_DOUBLE_ECC_ERR |
+                               RMAC_LINK_STATE_CHANGE_INT,
                                flag, &bar0->mac_rmac_err_mask);
        }
 
-       if (mask & RX_XGXS_INTR)
-       {
+       if (mask & RX_XGXS_INTR) {
                gen_int_mask |= RXXGXS_INT_M;
                do_s2io_write_bits(XGXS_INT_STATUS_RXGXS, flag,
                                &bar0->xgxs_int_mask);
@@ -2025,7 +3081,8 @@ static void en_dis_err_alarms(struct s2io_nic *nic, u16 mask, int flag)
 
        if (mask & MC_INTR) {
                gen_int_mask |= MC_INT_M;
-               do_s2io_write_bits(MC_INT_MASK_MC_INT, flag, &bar0->mc_int_mask);
+               do_s2io_write_bits(MC_INT_MASK_MC_INT, flag,
+                               &bar0->mc_int_mask);
                do_s2io_write_bits(MC_ERR_REG_SM_ERR | MC_ERR_REG_ECC_ALL_SNG |
                                MC_ERR_REG_ECC_ALL_DBL | PLL_LOCK_N, flag,
                                &bar0->mc_err_mask);
@@ -2035,6 +3092,7 @@ static void en_dis_err_alarms(struct s2io_nic *nic, u16 mask, int flag)
        /* Remove this line when alarm interrupts are enabled */
        nic->general_int_mask = 0;
 }
+
 /**
  *  en_dis_able_nic_intrs - Enable or Disable the interrupts
  *  @nic: device private variable,
@@ -2057,7 +3115,7 @@ static void en_dis_able_nic_intrs(struct s2io_nic *nic, u16 mask, int flag)
        /*  PIC Interrupts */
        if (mask & TX_PIC_INTR) {
                /*  Enable PIC Intrs in the general intr mask register */
-               intr_mask |= TXPIC_INT_M;
+               intr_mask |= TXPIC_INT_M ;
                if (flag == ENABLE_INTRS) {
                        /*
                         * If Hercules adapter enable GPIO otherwise
@@ -2124,12 +3182,12 @@ static void en_dis_able_nic_intrs(struct s2io_nic *nic, u16 mask, int flag)
 
        nic->general_int_mask = readq(&bar0->general_int_mask);
 }
-
 /**
  *  verify_pcc_quiescent- Checks for PCC quiescent state
  *  Return: 1 If PCC is quiescence
  *          0 If PCC is not quiescence
  */
+
 static int verify_pcc_quiescent(struct s2io_nic *sp, int flag)
 {
        int ret = 0, herc;
@@ -2139,7 +3197,7 @@ static int verify_pcc_quiescent(struct s2io_nic *sp, int flag)
        herc = (sp->device_type == XFRAME_II_DEVICE);
 
        if (flag == FALSE) {
-               if ((!herc && (sp->pdev->revision >= 4)) || herc) {
+               if ((!herc && (get_xena_rev_id(sp->pdev) >= 4)) || herc) {
                        if (!(val64 & ADAPTER_STATUS_RMAC_PCC_IDLE))
                                ret = 1;
                } else {
@@ -2147,7 +3205,7 @@ static int verify_pcc_quiescent(struct s2io_nic *sp, int flag)
                                ret = 1;
                }
        } else {
-               if ((!herc && (sp->pdev->revision >= 4)) || herc) {
+               if ((!herc && (get_xena_rev_id(sp->pdev) >= 4)) || herc) {
                        if (((val64 & ADAPTER_STATUS_RMAC_PCC_IDLE) ==
                             ADAPTER_STATUS_RMAC_PCC_IDLE))
                                ret = 1;
@@ -2160,6 +3218,7 @@ static int verify_pcc_quiescent(struct s2io_nic *sp, int flag)
 
        return ret;
 }
+
 /**
  *  verify_xena_quiescence - Checks whether the H/W is ready
  *  Description: Returns whether the H/W is ready to go or not. Depending
@@ -2169,7 +3228,6 @@ static int verify_pcc_quiescent(struct s2io_nic *sp, int flag)
  *  Return: 1 If xena is quiescence
  *          0 If Xena is not quiescence
  */
-
 static int verify_xena_quiescence(struct s2io_nic *sp)
 {
        int  mode;
@@ -2182,7 +3240,7 @@ static int verify_xena_quiescence(struct s2io_nic *sp)
                return 0;
        }
        if (!(val64 & ADAPTER_STATUS_RDMA_READY)) {
-       DBG_PRINT(ERR_DBG, "%s", "RDMA is not ready!");
+               DBG_PRINT(ERR_DBG, "%s", "RDMA is not ready!");
                return 0;
        }
        if (!(val64 & ADAPTER_STATUS_PFC_READY)) {
@@ -2209,35 +3267,37 @@ static int verify_xena_quiescence(struct s2io_nic *sp)
                DBG_PRINT(ERR_DBG, "%s", "M_PLL is not locked!");
                return 0;
        }
-
        /*
-        * In PCI 33 mode, the P_PLL is not used, and therefore,
-        * the the P_PLL_LOCK bit in the adapter_status register will
-        * not be asserted.
-        */
+       * In PCI 33 mode, the P_PLL is not used, and therefore,
+       * the the P_PLL_LOCK bit in the adapter_status register will
+       * not be asserted.
+       */
        if (!(val64 & ADAPTER_STATUS_P_PLL_LOCK) &&
-               sp->device_type == XFRAME_II_DEVICE && mode !=
-               PCI_MODE_PCI_33) {
-               DBG_PRINT(ERR_DBG, "%s", "P_PLL is not locked!");
-               return 0;
+               (sp->device_type == XFRAME_II_DEVICE) &&
+               (mode != PCI_MODE_PCI_33)) {
+                       DBG_PRINT(ERR_DBG, "%s", "P_PLL is not locked!");
+                       return 0;
        }
-       if (!((val64 & ADAPTER_STATUS_RC_PRC_QUIESCENT) ==
-                       ADAPTER_STATUS_RC_PRC_QUIESCENT)) {
-               DBG_PRINT(ERR_DBG, "%s", "RC_PRC is not QUIESCENT!");
-               return 0;
+       /* RC_PRC bit is only valid when ADAPTER_EN is not asserted */
+       if (!(readq(&bar0->adapter_control) & ADAPTER_CNTL_EN))
+               if (!((val64 & ADAPTER_STATUS_RC_PRC_QUIESCENT)
+                       == ADAPTER_STATUS_RC_PRC_QUIESCENT)) {
+                       DBG_PRINT(ERR_DBG, "%s", "RC_PRC is not QUIESCENT!");
+                       return 0;
        }
+
        return 1;
 }
 
 /**
- * fix_mac_address -  Fix for Mac addr problem on Alpha platforms
- * @sp: Pointer to device specifc structure
- * Description :
- * New procedure to clear mac address reading  problems on Alpha platforms
- *
- */
+* fix_mac_address -  Fix for Mac addr problem on Alpha platforms
+* @sp: Pointer to device specifc structure
+* Description :
+* New procedure to clear mac address reading  problems on Alpha platforms
+*
+*/
 
-static void fix_mac_address(struct s2io_nic * sp)
+static void fix_mac_address(struct s2io_nic *sp)
 {
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
        u64 val64;
@@ -2281,10 +3341,16 @@ static int start_nic(struct s2io_nic *nic)
                       &bar0->prc_rxd0_n[i]);
 
                val64 = readq(&bar0->prc_ctrl_n[i]);
+
                if (nic->rxd_mode == RXD_MODE_1)
                        val64 |= PRC_CTRL_RC_ENABLED;
+               else if (nic->rxd_mode == RXD_MODE_5)
+                       val64 |= PRC_CTRL_RC_ENABLED | PRC_CTRL_RING_MODE_5 |
+                                               PRC_CTRL_RTH_DISABLE;
                else
-                       val64 |= PRC_CTRL_RC_ENABLED | PRC_CTRL_RING_MODE_3;
+                       val64 |= PRC_CTRL_RC_ENABLED | PRC_CTRL_RING_MODE_3 |
+                                               PRC_CTRL_RTH_DISABLE;
+
                if (nic->device_type == XFRAME_II_DEVICE)
                        val64 |= PRC_CTRL_GROUP_READS;
                val64 &= ~PRC_CTRL_RXD_BACKOFF_INTERVAL(0xFFFFFF);
@@ -2299,11 +3365,12 @@ static int start_nic(struct s2io_nic *nic)
                writeq(val64, &bar0->rx_pa_cfg);
        }
 
-       if (vlan_tag_strip == 0) {
+       s2io_handle_vlan_tag_strip(nic, nic->vlan_strip_flag);
+
+       if (nic->device_type == XFRAME_II_DEVICE) {
                val64 = readq(&bar0->rx_pa_cfg);
-               val64 &= ~RX_PA_CFG_STRIP_VLAN_TAG;
+               val64 |= RX_PA_CFG_UDP_ZERO_CS_EN;
                writeq(val64, &bar0->rx_pa_cfg);
-               vlan_strip_flag = 0;
        }
 
        /*
@@ -2372,7 +3439,7 @@ static int start_nic(struct s2io_nic *nic)
  * s2io_txdl_getskb - Get the skb from txdl, unmap and return skb
  */
 static struct sk_buff *s2io_txdl_getskb(struct fifo_info *fifo_data, struct \
-                                       TxD *txdlp, int get_off)
+TxD *txdlp, int get_off)
 {
        struct s2io_nic *nic = fifo_data->nic;
        struct sk_buff *skb;
@@ -2380,12 +3447,14 @@ static struct sk_buff *s2io_txdl_getskb(struct fifo_info *fifo_data, struct \
        u16 j, frg_cnt;
 
        txds = txdlp;
+#ifdef NETIF_F_UFO
        if (txds->Host_Control == (u64)(long)fifo_data->ufo_in_band_v) {
                pci_unmap_single(nic->pdev, (dma_addr_t)
                        txds->Buffer_Pointer, sizeof(u64),
                        PCI_DMA_TODEVICE);
                txds++;
        }
+#endif
 
        skb = (struct sk_buff *) ((unsigned long)
                        txds->Host_Control);
@@ -2409,7 +3478,7 @@ static struct sk_buff *s2io_txdl_getskb(struct fifo_info *fifo_data, struct \
                                       frag->size, PCI_DMA_TODEVICE);
                }
        }
-       memset(txdlp,0, (sizeof(struct TxD) * fifo_data->max_txds));
+       memset(txdlp, 0, (sizeof(struct TxD) * fifo_data->max_txds));
        return(skb);
 }
 
@@ -2430,20 +3499,21 @@ static void free_tx_buffers(struct s2io_nic *nic)
        struct mac_info *mac_control;
        struct config_param *config;
        int cnt = 0;
+       struct swDbgStat *stats = nic->sw_dbg_stat;
 
        mac_control = &nic->mac_control;
        config = &nic->config;
 
        for (i = 0; i < config->tx_fifo_num; i++) {
                unsigned long flags;
+
                spin_lock_irqsave(&mac_control->fifos[i].tx_lock, flags);
                for (j = 0; j < config->tx_cfg[i].fifo_len; j++) {
-                       txdp = (struct TxD *) \
-                       mac_control->fifos[i].list_info[j].list_virt_addr;
+                       txdp = (struct TxD *) mac_control->fifos[i].
+                               list_info[j].list_virt_addr;
                        skb = s2io_txdl_getskb(&mac_control->fifos[i], txdp, j);
                        if (skb) {
-                               nic->mac_control.stats_info->sw_stat.mem_freed
-                                       += skb->truesize;
+                               stats->mem_freed += skb->truesize;
                                dev_kfree_skb(skb);
                                cnt++;
                        }
@@ -2472,11 +3542,6 @@ static void stop_nic(struct s2io_nic *nic)
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
        register u64 val64 = 0;
        u16 interruptible;
-       struct mac_info *mac_control;
-       struct config_param *config;
-
-       mac_control = &nic->mac_control;
-       config = &nic->config;
 
        /*  Disable all interrupts */
        en_dis_err_alarms(nic, ENA_ALL_INTRS, DISABLE_INTRS);
@@ -2490,20 +3555,159 @@ static void stop_nic(struct s2io_nic *nic)
        writeq(val64, &bar0->adapter_control);
 }
 
+static int fill_rxd_5buf(struct ring_info *ring, struct RxD5 *rxdp,
+struct sk_buff *skb, int ring_no, int rxd_index)
+{
+       struct sk_buff *frag_list = NULL;
+       u64 tmp;
+       struct rxRingStat *stats = ring->rx_ring_stat;
+
+       /* Buffer-1 receives L3/L4 headers */
+       ((struct RxD5 *)rxdp)->Buffer1_ptr = pci_map_single
+                       (ring->pdev, skb->data, l3l4hdr_size + 4,
+                       PCI_DMA_FROMDEVICE);
+       if ((((struct RxD5 *)rxdp)->Buffer1_ptr == 0) ||
+               (((struct RxD5 *)rxdp)->Buffer1_ptr == DMA_ERROR_CODE))
+               return -ENOMEM;;
+
+       /* skb_shinfo(skb)->frag_list will have L4 data payload */
+       skb_shinfo(skb)->frag_list = dev_alloc_skb(MODE5_BUF_SIZE + ALIGN_SIZE);
+       if (skb_shinfo(skb)->frag_list == NULL) {
+               stats->rx_mem_alloc_fail_cnt++;
+               goto unmap_buf1;
+       }
+       frag_list = skb_shinfo(skb)->frag_list;
+       skb->truesize += frag_list->truesize; /* updating skb->truesize */
+       stats->rx_mem_allocated += frag_list->truesize;
+       frag_list->next = NULL;
+
+       /*Align the RxD on 128 byte boundary */
+       tmp = (u64)(unsigned long) frag_list->data;
+       tmp += ALIGN_SIZE;
+       tmp &= ~ALIGN_SIZE;
+       frag_list->data = (void *) (unsigned long)tmp;
+       S2IO_SKB_INIT_TAIL(frag_list, tmp);
+
+       rxdp->Buffer2_ptr = pci_map_single(ring->pdev,
+                               frag_list->data, MODE5_BUF_SIZE,
+                               PCI_DMA_FROMDEVICE);
+       if ((rxdp->Buffer2_ptr == 0) ||
+               (rxdp->Buffer2_ptr == DMA_ERROR_CODE))
+               goto unmap_buf1;
+
+       rxdp->Control_3 &= (~MASK_BUFFER3_SIZE_5);
+       if (ring->skbs_per_rxd > 2) {
+               /* Allocate and map buffer3 */
+               frag_list->next = dev_alloc_skb(MODE5_BUF_SIZE + ALIGN_SIZE);
+               if (frag_list->next == NULL) {
+                       stats->rx_mem_alloc_fail_cnt++;
+                       goto unmap_buf2;
+               }
+
+               frag_list = frag_list->next;
+               skb->truesize += frag_list->truesize; /*updating skb->truesize*/
+               stats->rx_mem_allocated += frag_list->truesize;
+               frag_list->next = NULL;
+
+               /*Align the RxD on 128 byte boundary */
+               tmp = (u64)(unsigned long) frag_list->data;
+               tmp += ALIGN_SIZE;
+               tmp &= ~ALIGN_SIZE;
+               frag_list->data = (void *) (unsigned long)tmp;
+               S2IO_SKB_INIT_TAIL(frag_list, tmp);
+
+               rxdp->Buffer3_ptr = pci_map_single(ring->pdev,
+                                       frag_list->data, MODE5_BUF_SIZE,
+                                       PCI_DMA_FROMDEVICE);
+               if ((rxdp->Buffer3_ptr == 0) ||
+                       (rxdp->Buffer3_ptr == DMA_ERROR_CODE)) {
+                       frag_list = skb_shinfo(skb)->frag_list;
+                       goto unmap_buf2;
+               }
+               rxdp->Control_3 |= SET_BUFFER3_SIZE_5(MODE5_BUF_SIZE);
+       } else {
+               rxdp->Buffer3_ptr = rxdp->Buffer2_ptr;
+               rxdp->Control_3 |= SET_BUFFER3_SIZE_5(1);
+       }
+
+       rxdp->Control_3 &= (~MASK_BUFFER4_SIZE_5);
+       if (ring->skbs_per_rxd > 3) {
+               /* Allocate and map buffer4 */
+               frag_list->next = dev_alloc_skb(MODE5_BUF_SIZE + ALIGN_SIZE);
+               if (frag_list->next == NULL) {
+                       stats->rx_mem_alloc_fail_cnt++;
+                       frag_list = skb_shinfo(skb)->frag_list;
+                       goto unmap_buf3;
+               }
+
+               frag_list = frag_list->next;
+               skb->truesize += frag_list->truesize; /*updating skb->truesize*/
+               stats->rx_mem_allocated += frag_list->truesize;
+               frag_list->next = NULL;
+
+               /*Align the RxD on 128 byte boundary */
+               tmp = (u64)(unsigned long) frag_list->data;
+               tmp += ALIGN_SIZE;
+               tmp &= ~ALIGN_SIZE;
+               frag_list->data = (void *) (unsigned long)tmp;
+               S2IO_SKB_INIT_TAIL(frag_list, tmp);
+
+               rxdp->Buffer4_ptr = pci_map_single(ring->pdev,
+                                       frag_list->data, MODE5_BUF_SIZE,
+                                       PCI_DMA_FROMDEVICE);
+               if ((rxdp->Buffer4_ptr == 0) ||
+                       (rxdp->Buffer4_ptr == DMA_ERROR_CODE)) {
+                       frag_list = skb_shinfo(skb)->frag_list;
+                       goto unmap_buf3;
+               }
+               rxdp->Control_3 |= SET_BUFFER4_SIZE_5(MODE5_BUF_SIZE);
+       } else {
+               rxdp->Buffer4_ptr = rxdp->Buffer3_ptr;
+               rxdp->Control_3 |= SET_BUFFER4_SIZE_5(1);
+       }
+
+       /* Update the buffer sizes */
+       rxdp->Control_2 &= (~MASK_BUFFER0_SIZE_5);
+       rxdp->Control_2 |= SET_BUFFER0_SIZE_5(BUF0_LEN);
+       rxdp->Control_2 &= (~MASK_BUFFER1_SIZE_5);
+       rxdp->Control_2 |= SET_BUFFER1_SIZE_5(l3l4hdr_size + 4);
+       rxdp->Control_2 &= (~MASK_BUFFER2_SIZE_5);
+       rxdp->Control_2 |= SET_BUFFER2_SIZE_5(MODE5_BUF_SIZE);
+
+       rxdp->Host_Control = rxd_index;
+       ring->skbs[rxd_index] = (unsigned long) (skb);
+       return SUCCESS;
+
+unmap_buf3:
+               stats->rx_pci_map_fail_cnt++;
+               pci_unmap_single(ring->pdev,
+                       (dma_addr_t)(unsigned long)frag_list->next->data,
+                       MODE5_BUF_SIZE, PCI_DMA_FROMDEVICE);
+unmap_buf2:
+               stats->rx_pci_map_fail_cnt++;
+               pci_unmap_single(ring->pdev,
+                       (dma_addr_t)(unsigned long)frag_list->data,
+                       MODE5_BUF_SIZE, PCI_DMA_FROMDEVICE);
+unmap_buf1:
+               stats->rx_pci_map_fail_cnt++;
+               pci_unmap_single(ring->pdev,
+                       (dma_addr_t)(unsigned long)skb->data, l3l4hdr_size + 4,
+                       PCI_DMA_FROMDEVICE);
+               return -ENOMEM ;
+}
+
+
 /**
  *  fill_rx_buffers - Allocates the Rx side skbs
- *  @ring_info: per ring structure
- *  @from_card_up: If this is true, we will map the buffer to get
- *     the dma address for buf0 and buf1 to give it to the card.
- *     Else we will sync the already mapped buffer to give it to the card.
+ *  @nic:  device private variable
+ *  @ring_no: ring number
  *  Description:
  *  The function allocates Rx side skbs and puts the physical
  *  address of these buffers into the RxD buffer pointers, so that the NIC
  *  can DMA the received frame into these locations.
- *  The NIC supports 3 receive modes, viz
+ *  The NIC supports 2 receive modes, viz
  *  1. single buffer,
- *  2. three buffer and
- *  3. Five buffer modes.
+ *  2. Five buffer modes.
  *  Each mode defines how many fragments the received frame will be split
  *  up into by the NIC. The frame is split into L3 header, L4 Header,
  *  L4 payload in three buffer mode and in 5 buffer mode, L4 payload itself
@@ -2512,29 +3716,29 @@ static void stop_nic(struct s2io_nic *nic)
  *   Return Value:
  *  SUCCESS on success or an appropriate -ve value on failure.
  */
-static int fill_rx_buffers(struct s2io_nic *nic, struct ring_info *ring,
-                               int from_card_up)
+
+static int fill_rx_buffers(struct ring_info *ring)
 {
-       struct sk_buff *skb;
-       struct RxD_t *rxdp;
+       struct sk_buff *skb = NULL;
+       struct RxD_t *rxdp = NULL;
        int off, size, block_no, block_no1;
        u32 alloc_tab = 0;
        u32 alloc_cnt;
        u64 tmp;
-       struct buffAdd *ba;
+       struct buffAdd *ba = NULL;
        struct RxD_t *first_rxdp = NULL;
        u64 Buffer0_ptr = 0, Buffer1_ptr = 0;
        int rxd_index = 0;
        struct RxD1 *rxdp1;
        struct RxD3 *rxdp3;
-       struct swStat *stats = &ring->nic->mac_control.stats_info->sw_stat;
+       struct RxD5 *rxdp5;
+       struct rxRingStat *stats = ring->rx_ring_stat;
 
        alloc_cnt = ring->pkt_cnt - ring->rx_bufs_left;
 
        block_no1 = ring->rx_curr_get_info.block_index;
        while (alloc_tab < alloc_cnt) {
                block_no = ring->rx_curr_put_info.block_index;
-
                off = ring->rx_curr_put_info.offset;
 
                rxdp = ring->rx_blocks[block_no].rxds[off].virt_addr;
@@ -2551,7 +3755,8 @@ static int fill_rx_buffers(struct s2io_nic *nic, struct ring_info *ring,
                        DBG_PRINT(INTR_DBG, " info equated\n");
                        goto end;
                }
-               if (off && (off == ring->rxd_count)) {
+
+               if (off == ring->rxd_count) {
                        ring->rx_curr_put_info.block_index++;
                        if (ring->rx_curr_put_info.block_index ==
                                                        ring->block_count)
@@ -2562,22 +3767,24 @@ static int fill_rx_buffers(struct s2io_nic *nic, struct ring_info *ring,
                        rxdp = ring->rx_blocks[block_no].block_virt_addr;
                        DBG_PRINT(INTR_DBG, "%s: Next block at: %p\n",
                                  ring->dev->name, rxdp);
-
                }
 
                if ((rxdp->Control_1 & RXD_OWN_XENA) &&
                        ((ring->rxd_mode == RXD_MODE_3B) &&
-                               (rxdp->Control_2 & s2BIT(0)))) {
+                               (rxdp->Control_2 & S2BIT(0)))) {
                        ring->rx_curr_put_info.offset = off;
                        goto end;
                }
+
                /* calculate size of skb based on ring mode */
                size = ring->mtu + HEADER_ETHERNET_II_802_3_SIZE +
                                HEADER_802_2_SIZE + HEADER_SNAP_SIZE;
                if (ring->rxd_mode == RXD_MODE_1)
                        size += NET_IP_ALIGN;
-               else
+               else if (ring->rxd_mode == RXD_MODE_3B)
                        size = ring->mtu + ALIGN_SIZE + BUF0_LEN + 4;
+               else
+                       size = l3l4hdr_size + ALIGN_SIZE + BUF0_LEN + 4;
 
                /* allocate skb */
                skb = dev_alloc_skb(size);
@@ -2588,103 +3795,127 @@ static int fill_rx_buffers(struct s2io_nic *nic, struct ring_info *ring,
                                wmb();
                                first_rxdp->Control_1 |= RXD_OWN_XENA;
                        }
-                       stats->mem_alloc_fail_cnt++;
-
+                       stats->rx_mem_alloc_fail_cnt++;
                        return -ENOMEM ;
                }
-               stats->mem_allocated += skb->truesize;
-
+               stats->rx_mem_allocated += skb->truesize;
                if (ring->rxd_mode == RXD_MODE_1) {
                        /* 1 buffer mode - normal operation mode */
-                       rxdp1 = (struct RxD1*)rxdp;
+                       rxdp1 = (struct RxD1 *)rxdp;
                        memset(rxdp, 0, sizeof(struct RxD1));
                        skb_reserve(skb, NET_IP_ALIGN);
                        rxdp1->Buffer0_ptr = pci_map_single
-                           (ring->pdev, skb->data, size - NET_IP_ALIGN,
+                               (ring->pdev, skb->data, size - NET_IP_ALIGN,
                                PCI_DMA_FROMDEVICE);
-                       if (pci_dma_mapping_error(nic->pdev,
-                                               rxdp1->Buffer0_ptr))
+                       if ((rxdp1->Buffer0_ptr == 0) ||
+                               (rxdp1->Buffer0_ptr == DMA_ERROR_CODE))
                                goto pci_map_failed;
 
                        rxdp->Control_2 =
                                SET_BUFFER0_SIZE_1(size - NET_IP_ALIGN);
                        rxdp->Host_Control = (unsigned long) (skb);
-               } else if (ring->rxd_mode == RXD_MODE_3B) {
+               } else if (ring->rxd_mode >= RXD_MODE_3B) {
                        /*
                         * 2 buffer mode -
                         * 2 buffer mode provides 128
                         * byte aligned receive buffers.
+                        *
                         */
+                       ba = &ring->ba[block_no][off];
 
-                       rxdp3 = (struct RxD3*)rxdp;
-                       /* save buffer pointers to avoid frequent dma mapping */
+                       rxdp3 = (struct RxD3 *)rxdp;
+                       rxdp5 = (struct RxD5 *)rxdp;
+                       /* save the buffer pointers to avoid frequent
+                       * dma mapping
+                       */
                        Buffer0_ptr = rxdp3->Buffer0_ptr;
                        Buffer1_ptr = rxdp3->Buffer1_ptr;
-                       memset(rxdp, 0, sizeof(struct RxD3));
+                       if (ring->rxd_mode == RXD_MODE_5)
+                               memset(rxdp, 0, sizeof(struct RxD5));
+                       else
+                               memset(rxdp, 0, sizeof(struct RxD3));
                        /* restore the buffer pointers for dma sync*/
                        rxdp3->Buffer0_ptr = Buffer0_ptr;
                        rxdp3->Buffer1_ptr = Buffer1_ptr;
-
-                       ba = &ring->ba[block_no][off];
                        skb_reserve(skb, BUF0_LEN);
                        tmp = (u64)(unsigned long) skb->data;
                        tmp += ALIGN_SIZE;
                        tmp &= ~ALIGN_SIZE;
                        skb->data = (void *) (unsigned long)tmp;
-                       skb_reset_tail_pointer(skb);
+                       S2IO_SKB_INIT_TAIL(skb, tmp);
 
-                       if (from_card_up) {
+                       if (!(rxdp3->Buffer0_ptr))
                                rxdp3->Buffer0_ptr =
-                                  pci_map_single(ring->pdev, ba->ba_0,
-                                       BUF0_LEN, PCI_DMA_FROMDEVICE);
-                       if (pci_dma_mapping_error(nic->pdev,
-                                               rxdp3->Buffer0_ptr))
-                                       goto pci_map_failed;
-                       } else
+                                       pci_map_single(ring->pdev, ba->ba_0,
+                                               BUF0_LEN, PCI_DMA_FROMDEVICE);
+                       else
                                pci_dma_sync_single_for_device(ring->pdev,
-                               (dma_addr_t) rxdp3->Buffer0_ptr,
-                                   BUF0_LEN, PCI_DMA_FROMDEVICE);
+                                       (dma_addr_t) rxdp3->Buffer0_ptr,
+                                       BUF0_LEN, PCI_DMA_FROMDEVICE);
+
+                       if ((rxdp3->Buffer0_ptr == 0) ||
+                               (rxdp3->Buffer0_ptr == DMA_ERROR_CODE))
+                               goto pci_map_failed;
 
-                       rxdp->Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN);
-                       if (ring->rxd_mode == RXD_MODE_3B) {
+                       if (ring->rxd_mode == RXD_MODE_5) {
+                               if (fill_rxd_5buf(ring, rxdp5, skb,
+                                       ring->ring_no, rxd_index) == -ENOMEM) {
+                                       stats->rx_mem_freed += skb->truesize;
+                                       dev_kfree_skb_irq(skb);
+                                       if (first_rxdp) {
+                                               wmb();
+                                               first_rxdp->Control_1 |=
+                                                       RXD_OWN_XENA;
+                                       }
+                                       return -ENOMEM ;
+                               }
+                       } else {
                                /* Two buffer mode */
 
+                               rxdp->Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN);
+
                                /*
-                                * Buffer2 will have L3/L4 header plus
-                                * L4 payload
-                                */
-                               rxdp3->Buffer2_ptr = pci_map_single
-                               (ring->pdev, skb->data, ring->mtu + 4,
+                               *Buffer2 will have L3/L4 header plus
+                               * L4 payload
+                               */
+
+                               rxdp3->Buffer2_ptr =
+                                       pci_map_single(ring->pdev,
+                                               skb->data,
+                                               ring->mtu + 4,
                                                PCI_DMA_FROMDEVICE);
 
-                               if (pci_dma_mapping_error(nic->pdev,
-                                                       rxdp3->Buffer2_ptr))
+                               if ((rxdp3->Buffer2_ptr == 0) ||
+                                       (rxdp3->Buffer2_ptr ==
+                                               DMA_ERROR_CODE))
                                        goto pci_map_failed;
 
-                               if (from_card_up) {
+                               /* Buffer-1 will be dummy buffer */
+                               if (!(rxdp3->Buffer1_ptr))
                                        rxdp3->Buffer1_ptr =
-                                               pci_map_single(ring->pdev,
+                                           pci_map_single(ring->pdev,
                                                ba->ba_1, BUF1_LEN,
                                                PCI_DMA_FROMDEVICE);
 
-                                       if (pci_dma_mapping_error(nic->pdev,
-                                               rxdp3->Buffer1_ptr)) {
-                                               pci_unmap_single
-                                                       (ring->pdev,
-                                                   (dma_addr_t)(unsigned long)
-                                                       skb->data,
-                                                       ring->mtu + 4,
-                                                       PCI_DMA_FROMDEVICE);
-                                               goto pci_map_failed;
-                                       }
+                               if ((rxdp3->Buffer1_ptr == 0) ||
+                                       (rxdp3->Buffer1_ptr ==
+                                               DMA_ERROR_CODE)) {
+                                       pci_unmap_single(ring->pdev,
+                                           (dma_addr_t)(unsigned long)
+                                               skb->data,
+                                           ring->mtu + 4,
+                                           PCI_DMA_FROMDEVICE);
+                                       goto pci_map_failed;
                                }
-                               rxdp->Control_2 |= SET_BUFFER1_SIZE_3(1);
-                               rxdp->Control_2 |= SET_BUFFER2_SIZE_3
-                                                               (ring->mtu + 4);
+                               rxdp->Control_2 |=
+                                       SET_BUFFER1_SIZE_3(1);
+                               rxdp->Control_2 |=
+                                   SET_BUFFER2_SIZE_3(ring->mtu + 4);
+
+                               rxdp->Host_Control = (unsigned long) (skb);
                        }
-                       rxdp->Control_2 |= s2BIT(0);
-                       rxdp->Host_Control = (unsigned long) (skb);
                }
+
                if (alloc_tab & ((1 << rxsync_frequency) - 1))
                        rxdp->Control_1 |= RXD_OWN_XENA;
                off++;
@@ -2704,7 +3935,7 @@ static int fill_rx_buffers(struct s2io_nic *nic, struct ring_info *ring,
                alloc_tab++;
        }
 
-      end:
+end:
        /* Transfer ownership of first descriptor to adapter just before
         * exiting. Before that, use memory barrier so that ownership
         * and other fields are seen by adapter correctly.
@@ -2716,63 +3947,93 @@ static int fill_rx_buffers(struct s2io_nic *nic, struct ring_info *ring,
 
        return SUCCESS;
 pci_map_failed:
-       stats->pci_map_fail_cnt++;
-       stats->mem_freed += skb->truesize;
+       stats->rx_pci_map_fail_cnt++;
+       stats->rx_mem_freed += skb->truesize;
        dev_kfree_skb_irq(skb);
        return -ENOMEM;
 }
 
-static void free_rxd_blk(struct s2io_nic *sp, int ring_no, int blk)
+static void free_rxd_blk(struct ring_info *ring, int blk)
 {
-       struct net_device *dev = sp->dev;
        int j;
        struct sk_buff *skb;
        struct RxD_t *rxdp;
-       struct mac_info *mac_control;
-       struct buffAdd *ba;
        struct RxD1 *rxdp1;
        struct RxD3 *rxdp3;
+       struct RxD5 *rxdp5;
+       struct rxRingStat *stats = ring->rx_ring_stat;
+
+       for (j = 0 ; j < rxd_count[ring->rxd_mode]; j++) {
+               rxdp = ring->rx_blocks[blk].rxds[j].virt_addr;
+               if (ring->rxd_mode == RXD_MODE_5) {
+                       rxdp5 = (struct RxD5 *)rxdp;
+                       skb = (struct sk_buff *)
+                               ((unsigned long)ring->
+                                       skbs[((u64) rxdp5->Host_Control)]);
+               } else
+                       skb = (struct sk_buff *)
+                               ((unsigned long) rxdp->Host_Control);
 
-       mac_control = &sp->mac_control;
-       for (j = 0 ; j < rxd_count[sp->rxd_mode]; j++) {
-               rxdp = mac_control->rings[ring_no].
-                                rx_blocks[blk].rxds[j].virt_addr;
-               skb = (struct sk_buff *)
-                       ((unsigned long) rxdp->Host_Control);
-               if (!skb) {
+               if (!skb)
                        continue;
-               }
-               if (sp->rxd_mode == RXD_MODE_1) {
-                       rxdp1 = (struct RxD1*)rxdp;
-                       pci_unmap_single(sp->pdev, (dma_addr_t)
+
+               switch (ring->rxd_mode) {
+               case RXD_MODE_1:
+                       rxdp1 = (struct RxD1 *)rxdp;
+                       pci_unmap_single(ring->pdev, (dma_addr_t)
                                rxdp1->Buffer0_ptr,
-                               dev->mtu +
-                               HEADER_ETHERNET_II_802_3_SIZE
-                               + HEADER_802_2_SIZE +
-                               HEADER_SNAP_SIZE,
+                               ring->mtu + HEADER_ETHERNET_II_802_3_SIZE +
+                               HEADER_802_2_SIZE + HEADER_SNAP_SIZE,
                                PCI_DMA_FROMDEVICE);
-                       memset(rxdp, 0, sizeof(struct RxD1));
-               } else if(sp->rxd_mode == RXD_MODE_3B) {
-                       rxdp3 = (struct RxD3*)rxdp;
-                       ba = &mac_control->rings[ring_no].
-                               ba[blk][j];
-                       pci_unmap_single(sp->pdev, (dma_addr_t)
+                               memset(rxdp, 0, sizeof(struct RxD1));
+                       break;
+
+               case RXD_MODE_5:
+                       rxdp5 = (struct RxD5 *)rxdp;
+                       pci_unmap_single(ring->pdev, (dma_addr_t)
+                               rxdp5->Buffer0_ptr,
+                               BUF0_LEN,
+                               PCI_DMA_FROMDEVICE);
+                       pci_unmap_single(ring->pdev, (dma_addr_t)
+                               rxdp5->Buffer1_ptr,
+                               l3l4hdr_size + 4,
+                               PCI_DMA_FROMDEVICE);
+                       pci_unmap_single(ring->pdev, (dma_addr_t)
+                               rxdp5->Buffer2_ptr,
+                               MODE5_BUF_SIZE,
+                               PCI_DMA_FROMDEVICE);
+                       if (ring->skbs_per_rxd > 2)
+                               pci_unmap_single(ring->pdev, (dma_addr_t)
+                                       rxdp5->Buffer3_ptr,
+                                       MODE5_BUF_SIZE,
+                                       PCI_DMA_FROMDEVICE);
+                       if (ring->skbs_per_rxd > 3)
+                               pci_unmap_single(ring->pdev, (dma_addr_t)
+                                       rxdp5->Buffer4_ptr,
+                                       MODE5_BUF_SIZE,
+                                       PCI_DMA_FROMDEVICE);
+                       memset(rxdp, 0, sizeof(struct RxD5));
+                       break;
+
+               case RXD_MODE_3B:
+                       rxdp3 = (struct RxD3 *)rxdp;
+                       pci_unmap_single(ring->pdev, (dma_addr_t)
                                rxdp3->Buffer0_ptr,
                                BUF0_LEN,
                                PCI_DMA_FROMDEVICE);
-                       pci_unmap_single(sp->pdev, (dma_addr_t)
+                       pci_unmap_single(ring->pdev, (dma_addr_t)
                                rxdp3->Buffer1_ptr,
                                BUF1_LEN,
                                PCI_DMA_FROMDEVICE);
-                       pci_unmap_single(sp->pdev, (dma_addr_t)
+                       pci_unmap_single(ring->pdev, (dma_addr_t)
                                rxdp3->Buffer2_ptr,
-                               dev->mtu + 4,
-                               PCI_DMA_FROMDEVICE);
+                               ring->mtu + 4, PCI_DMA_FROMDEVICE);
                        memset(rxdp, 0, sizeof(struct RxD3));
+                       break;
                }
-               sp->mac_control.stats_info->sw_stat.mem_freed += skb->truesize;
+               stats->rx_mem_freed += skb->truesize;
                dev_kfree_skb(skb);
-               mac_control->rings[ring_no].rx_bufs_left -= 1;
+               ring->rx_bufs_left -= 1;
        }
 }
 
@@ -2796,31 +4057,34 @@ static void free_rx_buffers(struct s2io_nic *sp)
        config = &sp->config;
 
        for (i = 0; i < config->rx_ring_num; i++) {
+
                for (blk = 0; blk < rx_ring_sz[i]; blk++)
-                       free_rxd_blk(sp,i,blk);
+                       free_rxd_blk(&mac_control->rings[i], blk);
 
                mac_control->rings[i].rx_curr_put_info.block_index = 0;
                mac_control->rings[i].rx_curr_get_info.block_index = 0;
                mac_control->rings[i].rx_curr_put_info.offset = 0;
                mac_control->rings[i].rx_curr_get_info.offset = 0;
                mac_control->rings[i].rx_bufs_left = 0;
+
                DBG_PRINT(INIT_DBG, "%s:Freed 0x%x Rx Buffers on ring%d\n",
                          dev->name, buf_cnt, i);
        }
 }
 
-static int s2io_chk_rx_buffers(struct s2io_nic *nic, struct ring_info *ring)
+static int s2io_chk_rx_buffers(struct ring_info *ring)
 {
-       if (fill_rx_buffers(nic, ring, 0) == -ENOMEM) {
-               DBG_PRINT(INFO_DBG, "%s:Out of memory", ring->dev->name);
+       if (fill_rx_buffers(ring) == -ENOMEM) {
+               DBG_PRINT(INFO_DBG, "%s - %s:Out of memory", __FUNCTION__,
+               ring->dev->name);
                DBG_PRINT(INFO_DBG, " in Rx Intr!!\n");
        }
        return 0;
 }
 
 /**
- * s2io_poll - Rx interrupt handler for NAPI support
- * @napi : pointer to the napi structure.
+ * s2io_poll - Rx interrupt handler for New NAPI support
+ * @dev : pointer to the device structure.
  * @budget : The number of packets that were budgeted to be processed
  * during  one pass through the 'Poll" function.
  * Description:
@@ -2828,18 +4092,20 @@ static int s2io_chk_rx_buffers(struct s2io_nic *nic, struct ring_info *ring)
  * the same thing that rx_intr_handler does, but not in a interrupt context
  * also It will process only a given number of packets.
  * Return value:
- * 0 on success and 1 if there are No Rx packets to be processed.
+ * No of Rx packets processed.
  */
 
-static int s2io_poll_msix(struct napi_struct *napi, int budget)
+#if defined(HAVE_NETDEV_POLL)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
+static int s2io_poll(struct napi_struct *napi, int budget)
 {
        struct ring_info *ring = container_of(napi, struct ring_info, napi);
        struct net_device *dev = ring->dev;
        struct config_param *config;
        struct mac_info *mac_control;
        int pkts_processed = 0;
-       u8 __iomem *addr = NULL;
-       u8 val8 = 0;
+       int ring_pkts_processed, i;
+       u8 *addr = NULL, val8 = 0;
        struct s2io_nic *nic = dev->priv;
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
        int budget_org = budget;
@@ -2850,55 +4116,106 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
        if (unlikely(!is_s2io_card_up(nic)))
                return 0;
 
-       pkts_processed = rx_intr_handler(ring, budget);
-       s2io_chk_rx_buffers(nic, ring);
+       if (config->intr_type == INTA) {
+               for (i = 0; i < config->rx_ring_num; i++) {
+                       ring = &mac_control->rings[i];
+                       ring_pkts_processed = rx_intr_handler(ring, budget);
+                       s2io_chk_rx_buffers(ring);
+                       pkts_processed += ring_pkts_processed;
+                       budget -= ring_pkts_processed;
+
+                       if (budget <= 0)
+                               break;
+               }
+       } else {
+               pkts_processed = rx_intr_handler(ring, budget);
+               s2io_chk_rx_buffers(ring);
+       }
 
        if (pkts_processed < budget_org) {
                netif_rx_complete(dev, napi);
-               /*Re Enable MSI-Rx Vector*/
-               addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
-               addr += 7 - ring->ring_no;
-               val8 = (ring->ring_no == 0) ? 0x3f : 0xbf;
-               writeb(val8, addr);
-               val8 = readb(addr);
+               if (config->intr_type == INTA) {
+                       /* Re enable the Rx interrupts for the ring */
+                       writeq(0, &bar0->rx_traffic_mask);
+                       readl(&bar0->rx_traffic_mask);
+               } else {
+                       /*Re Enable MSI-Rx Vector*/
+                       addr = (u8 *)&bar0->xmsi_mask_reg;
+                       addr += 7 - ring->ring_no;
+                       val8 = (ring->ring_no == 0) ? 0x3f : 0xbf;
+                       writeb(val8, addr);
+                       val8 = readb(addr);
+               }
        }
        return pkts_processed;
 }
-static int s2io_poll_inta(struct napi_struct *napi, int budget)
+#else
+/**
+ * s2io_poll - Rx interrupt handler for NAPI support
+ * @dev : pointer to the device structure.
+ * @budget : The number of packets that were budgeted to be processed
+ * during  one pass through the 'Poll" function.
+ * Description:
+ * Comes into picture only if NAPI support has been incorporated. It does
+ * the same thing that rx_intr_handler does, but not in a interrupt context
+ * also It will process only a given number of packets.
+ * Return value:
+ * 0 on success and 1 if there are No Rx packets to be processed.
+ */
+static int s2io_poll(struct net_device *dev, int *budget)
 {
-       struct s2io_nic *nic = container_of(napi, struct s2io_nic, napi);
-       struct ring_info *ring;
-       struct net_device *dev = nic->dev;
-       struct config_param *config;
+       struct s2io_nic *nic = dev->priv;
+       int pkt_cnt = 0, org_pkts_to_process;
        struct mac_info *mac_control;
-       int pkts_processed = 0;
-       int ring_pkts_processed, i;
+       struct config_param *config;
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
-       int budget_org = budget;
-
-       config = &nic->config;
-       mac_control = &nic->mac_control;
+       int i;
 
        if (unlikely(!is_s2io_card_up(nic)))
                return 0;
 
+       mac_control = &nic->mac_control;
+       config = &nic->config;
+
+       nic->pkts_to_process = *budget;
+       if (nic->pkts_to_process > dev->quota)
+               nic->pkts_to_process = dev->quota;
+       org_pkts_to_process = nic->pkts_to_process;
+
        for (i = 0; i < config->rx_ring_num; i++) {
-               ring = &mac_control->rings[i];
-               ring_pkts_processed = rx_intr_handler(ring, budget);
-               s2io_chk_rx_buffers(nic, ring);
-               pkts_processed += ring_pkts_processed;
-               budget -= ring_pkts_processed;
-               if (budget <= 0)
-                       break;
-       }
-       if (pkts_processed < budget_org) {
-               netif_rx_complete(dev, napi);
-               /* Re enable the Rx interrupts for the ring */
-               writeq(0, &bar0->rx_traffic_mask);
-               readl(&bar0->rx_traffic_mask);
+               rx_intr_handler(&mac_control->rings[i], 0);
+               pkt_cnt = org_pkts_to_process - nic->pkts_to_process;
+               if (!nic->pkts_to_process) {
+                       /* Quota for the current iteration has been met */
+                       goto no_rx;
+               }
        }
-       return pkts_processed;
+
+       if (!pkt_cnt)
+               pkt_cnt = 1;
+
+       dev->quota -= pkt_cnt;
+       *budget -= pkt_cnt;
+       netif_rx_complete(dev);
+
+       for (i = 0; i < config->rx_ring_num; i++)
+               s2io_chk_rx_buffers(&mac_control->rings[i]);
+
+       /* Re enable the Rx interrupts. */
+       writeq(0x0, &bar0->rx_traffic_mask);
+       readl(&bar0->rx_traffic_mask);
+
+       return 0;
+no_rx:
+       dev->quota -= pkt_cnt;
+       *budget -= pkt_cnt;
+
+       for (i = 0; i < config->rx_ring_num; i++)
+               s2io_chk_rx_buffers(&mac_control->rings[i]);
+       return 1;
 }
+#endif
+#endif
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
 /**
@@ -2918,9 +4235,10 @@ static void s2io_netpoll(struct net_device *dev)
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
        u64 val64 = 0xFFFFFFFFFFFFFFFFULL;
        int i;
-
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21))
        if (pci_channel_offline(nic->pdev))
                return;
+#endif
 
        disable_irq(dev->irq);
 
@@ -2942,9 +4260,9 @@ static void s2io_netpoll(struct net_device *dev)
                rx_intr_handler(&mac_control->rings[i], 0);
 
        for (i = 0; i < config->rx_ring_num; i++) {
-               if (fill_rx_buffers(nic, &mac_control->rings[i], 0) ==
-                               -ENOMEM) {
-                       DBG_PRINT(INFO_DBG, "%s:Out of memory", dev->name);
+               if (fill_rx_buffers(&mac_control->rings[i]) == -ENOMEM) {
+                       DBG_PRINT(INFO_DBG, "%s - %s:Out of memory",
+                       __FUNCTION__, dev->name);
                        DBG_PRINT(INFO_DBG, " in Rx Netpoll!!\n");
                        break;
                }
@@ -2954,10 +4272,38 @@ static void s2io_netpoll(struct net_device *dev)
 }
 #endif
 
+static inline void clear_lro_session(struct lro *lro)
+{
+       lro->in_use = 0;
+       lro->saw_ts = 0;
+       lro->last_frag = NULL;
+}
+
+static inline void queue_rx_frame(struct sk_buff *skb, struct ring_info *ring,
+       u16 vlan_tag)
+{
+       struct vlan_group *vlgrp = ring->vlgrp;
+       u8  vlan_strip_flag = ring->vlan_strip_flag;
+
+       skb->protocol = eth_type_trans(skb, ring->dev);
+       if (vlgrp && vlan_tag
+               && (vlan_strip_flag == S2IO_STRIP_VLAN_TAG)) {
+               /* Queueing the vlan frame to the upper layer */
+               if (ring->config_napi)
+                       vlan_hwaccel_receive_skb(skb, vlgrp, vlan_tag);
+               else
+                       vlan_hwaccel_rx(skb, vlgrp, vlan_tag);
+       } else {
+               if (ring->config_napi)
+                       netif_receive_skb(skb);
+               else
+                       netif_rx(skb);
+       }
+}
+
 /**
  *  rx_intr_handler - Rx interrupt handler
- *  @ring_info: per ring structure.
- *  @budget: budget for napi processing.
+ *  @nic: device private variable.
  *  Description:
  *  If the interrupt is because of a received frame or if the
  *  receive ring contains fresh as yet un-processed frames,this function is
@@ -2967,7 +4313,7 @@ static void s2io_netpoll(struct net_device *dev)
  *  Return Value:
  *  No. of napi packets processed.
  */
-static int rx_intr_handler(struct ring_info *ring_data, int budget)
+static int rx_intr_handler(struct ring_info *ring, int budget)
 {
        int get_block, put_block;
        struct rx_curr_get_info get_info, put_info;
@@ -2975,85 +4321,128 @@ static int rx_intr_handler(struct ring_info *ring_data, int budget)
        struct sk_buff *skb;
        int pkt_cnt = 0, napi_pkts = 0;
        int i;
-       struct RxD1* rxdp1;
-       struct RxD3* rxdp3;
+       struct RxD1 *rxdp1;
+       struct RxD3 *rxdp3;
+       struct RxD5 *rxdp5;
 
-       get_info = ring_data->rx_curr_get_info;
+       get_info = ring->rx_curr_get_info;
        get_block = get_info.block_index;
-       memcpy(&put_info, &ring_data->rx_curr_put_info, sizeof(put_info));
+       memcpy(&put_info, &ring->rx_curr_put_info, sizeof(put_info));
        put_block = put_info.block_index;
-       rxdp = ring_data->rx_blocks[get_block].rxds[get_info.offset].virt_addr;
-
+       rxdp = ring->rx_blocks[get_block].rxds[get_info.offset].virt_addr;
        while (RXD_IS_UP2DT(rxdp)) {
-               /*
-                * If your are next to put index then it's
-                * FIFO full condition
-                */
+               /* If your are next to put index then it's FIFO
+               * full condition
+               */
                if ((get_block == put_block) &&
-                   (get_info.offset + 1) == put_info.offset) {
-                       DBG_PRINT(INTR_DBG, "%s: Ring Full\n",
-                               ring_data->dev->name);
+                       ((get_info.offset + 1) == put_info.offset)) {
+                       DBG_PRINT(INTR_DBG, "%s: Ring Full\n", ring->dev->name);
                        break;
                }
-               skb = (struct sk_buff *) ((unsigned long)rxdp->Host_Control);
+               if (ring->rxd_mode == RXD_MODE_5)
+                       skb = (struct sk_buff *)
+                               ((unsigned long)ring->skbs[((unsigned long) \
+                                       ((struct RxD5 *)rxdp)->Host_Control)]);
+               else
+                       skb = (struct sk_buff *) ((unsigned long)
+                                                       rxdp->Host_Control);
+
                if (skb == NULL) {
-                       DBG_PRINT(ERR_DBG, "%s: The skb is ",
-                                 ring_data->dev->name);
-                       DBG_PRINT(ERR_DBG, "Null in Rx Intr\n");
+                       DBG_PRINT(INTR_DBG, "%s: The skb is ",
+                               ring->dev->name);
+                       DBG_PRINT(INTR_DBG, "Null in Rx Intr\n");
+                       ring->rx_ring_stat->skb_null_rx_intr_handler_cnt++;
                        return 0;
                }
-               if (ring_data->rxd_mode == RXD_MODE_1) {
-                       rxdp1 = (struct RxD1*)rxdp;
-                       pci_unmap_single(ring_data->pdev, (dma_addr_t)
+
+               switch (ring->rxd_mode) {
+               case RXD_MODE_1:
+                       rxdp1 = (struct RxD1 *)rxdp;
+                       pci_unmap_single(ring->pdev, (dma_addr_t)
                                rxdp1->Buffer0_ptr,
-                               ring_data->mtu +
+                               ring->mtu +
                                HEADER_ETHERNET_II_802_3_SIZE +
                                HEADER_802_2_SIZE +
                                HEADER_SNAP_SIZE,
                                PCI_DMA_FROMDEVICE);
-               } else if (ring_data->rxd_mode == RXD_MODE_3B) {
-                       rxdp3 = (struct RxD3*)rxdp;
-                       pci_dma_sync_single_for_cpu(ring_data->pdev, (dma_addr_t)
+                       break;
+
+               case RXD_MODE_5:
+                       rxdp5 = (struct RxD5 *)rxdp;
+                       pci_dma_sync_single_for_cpu(ring->pdev, (dma_addr_t)
+                               rxdp5->Buffer0_ptr, BUF0_LEN,
+                               PCI_DMA_FROMDEVICE);
+                       pci_unmap_single(ring->pdev, (dma_addr_t)
+                               rxdp5->Buffer1_ptr,
+                               l3l4hdr_size + 4,
+                               PCI_DMA_FROMDEVICE);
+                       pci_unmap_single(ring->pdev, (dma_addr_t)
+                               rxdp5->Buffer2_ptr,
+                               MODE5_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                       if (ring->skbs_per_rxd > 2)
+                               pci_unmap_single(ring->pdev, (dma_addr_t)
+                                       rxdp5->Buffer3_ptr,
+                                       MODE5_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                       if (ring->skbs_per_rxd > 3)
+                               pci_unmap_single(ring->pdev, (dma_addr_t)
+                                       rxdp5->Buffer4_ptr,
+                                       MODE5_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                       break;
+
+               case RXD_MODE_3B:
+                       rxdp3 = (struct RxD3 *)rxdp;
+                       pci_dma_sync_single_for_cpu(ring->pdev, (dma_addr_t)
                                rxdp3->Buffer0_ptr,
                                BUF0_LEN, PCI_DMA_FROMDEVICE);
-                       pci_unmap_single(ring_data->pdev, (dma_addr_t)
+                       pci_unmap_single(ring->pdev, (dma_addr_t)
                                rxdp3->Buffer2_ptr,
-                               ring_data->mtu + 4,
+                               ring->mtu + 4,
                                PCI_DMA_FROMDEVICE);
+                       break;
                }
-               prefetch(skb->data);
-               rx_osm_handler(ring_data, rxdp);
+
+               (void) rx_osm_handler(ring, rxdp);
                get_info.offset++;
-               ring_data->rx_curr_get_info.offset = get_info.offset;
-               rxdp = ring_data->rx_blocks[get_block].
+               ring->rx_curr_get_info.offset = get_info.offset;
+               rxdp = ring->rx_blocks[get_block].
                                rxds[get_info.offset].virt_addr;
-               if (get_info.offset == rxd_count[ring_data->rxd_mode]) {
+               if (get_info.offset == ring->rxd_count) {
                        get_info.offset = 0;
-                       ring_data->rx_curr_get_info.offset = get_info.offset;
+                       ring->rx_curr_get_info.offset = get_info.offset;
                        get_block++;
-                       if (get_block == ring_data->block_count)
+                       if (get_block == ring->block_count)
                                get_block = 0;
-                       ring_data->rx_curr_get_info.block_index = get_block;
-                       rxdp = ring_data->rx_blocks[get_block].block_virt_addr;
+                       ring->rx_curr_get_info.block_index = get_block;
+                       rxdp = ring->rx_blocks[get_block].block_virt_addr;
                }
 
-               if (ring_data->nic->config.napi) {
+               if (ring->config_napi) {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24))
+                       ring->nic->pkts_to_process -= 1;
+                       if (!ring->nic->pkts_to_process)
+                               break;
+#else
                        budget--;
                        napi_pkts++;
                        if (!budget)
                                break;
+#endif
                }
+
                pkt_cnt++;
                if ((indicate_max_pkts) && (pkt_cnt > indicate_max_pkts))
                        break;
+
        }
-       if (ring_data->lro) {
+
+       if (ring->lro) {
                /* Clear all LRO sessions before exiting */
                for (i=0; i<MAX_LRO_SESSIONS; i++) {
-                       struct lro *lro = &ring_data->lro0_n[i];
+                       struct lro *lro = &ring->lro0_n[i];
                        if (lro->in_use) {
-                               update_L3L4_header(ring_data->nic, lro);
-                               queue_rx_frame(lro->parent, lro->vlan_tag);
+                               update_L3L4_header(ring, lro, ring->ring_no);
+                               queue_rx_frame(lro->parent, ring,
+                                       lro->vlan_tag);
                                clear_lro_session(lro);
                        }
                }
@@ -3075,83 +4464,78 @@ static int rx_intr_handler(struct ring_info *ring_data, int budget)
 
 static void tx_intr_handler(struct fifo_info *fifo_data)
 {
+       u8 err;
        struct s2io_nic *nic = fifo_data->nic;
        struct tx_curr_get_info get_info, put_info;
        struct sk_buff *skb = NULL;
        struct TxD *txdlp;
+       struct sk_buff *head = NULL;
+       struct sk_buff **temp;
        int pkt_cnt = 0;
        unsigned long flags = 0;
-       u8 err_mask;
+       struct swDbgStat *stats = nic->sw_dbg_stat;
 
        if (!spin_trylock_irqsave(&fifo_data->tx_lock, flags))
-                       return;
+               return;
 
        get_info = fifo_data->tx_curr_get_info;
-       memcpy(&put_info, &fifo_data->tx_curr_put_info, sizeof(put_info));
+       put_info = fifo_data->tx_curr_put_info;
        txdlp = (struct TxD *) fifo_data->list_info[get_info.offset].
-           list_virt_addr;
+               list_virt_addr;
        while ((!(txdlp->Control_1 & TXD_LIST_OWN_XENA)) &&
-              (get_info.offset != put_info.offset) &&
-              (txdlp->Host_Control)) {
+               (get_info.offset != put_info.offset) &&
+               (txdlp->Host_Control)) {
                /* Check for TxD errors */
-               if (txdlp->Control_1 & TXD_T_CODE) {
-                       unsigned long long err;
-                       err = txdlp->Control_1 & TXD_T_CODE;
-                       if (err & 0x1) {
-                               nic->mac_control.stats_info->sw_stat.
-                                               parity_err_cnt++;
-                       }
+               err = GET_TXD_T_CODE(txdlp->Control_1);
+               if (err) {
 
                        /* update t_code statistics */
-                       err_mask = err >> 48;
-                       switch(err_mask) {
-                               case 2:
-                                       nic->mac_control.stats_info->sw_stat.
-                                                       tx_buf_abort_cnt++;
+                       switch (err) {
+                       case 2:
+                               fifo_data->tx_fifo_stat->tx_buf_abort_cnt++;
                                break;
 
-                               case 3:
-                                       nic->mac_control.stats_info->sw_stat.
-                                                       tx_desc_abort_cnt++;
+                       case 3:
+                               fifo_data->tx_fifo_stat->tx_desc_abort_cnt++;
                                break;
 
-                               case 7:
-                                       nic->mac_control.stats_info->sw_stat.
-                                                       tx_parity_err_cnt++;
+                       case 7:
+                               fifo_data->tx_fifo_stat->tx_parity_err_cnt++;
                                break;
 
-                               case 10:
-                                       nic->mac_control.stats_info->sw_stat.
-                                                       tx_link_loss_cnt++;
+                       case 10:
+                               fifo_data->tx_fifo_stat->tx_link_loss_cnt++;
                                break;
 
-                               case 15:
-                                       nic->mac_control.stats_info->sw_stat.
-                                                       tx_list_proc_err_cnt++;
+                       case 15:
+                               fifo_data->tx_fifo_stat->tx_list_proc_err_cnt++;
                                break;
-                        }
+                       }
                }
 
                skb = s2io_txdl_getskb(fifo_data, txdlp, get_info.offset);
                if (skb == NULL) {
                        spin_unlock_irqrestore(&fifo_data->tx_lock, flags);
-                       DBG_PRINT(ERR_DBG, "%s: Null skb ",
+                       DBG_PRINT(INTR_DBG, "%s: Null skb ",
                        __FUNCTION__);
-                       DBG_PRINT(ERR_DBG, "in Tx Free Intr\n");
+                       DBG_PRINT(INTR_DBG, "in Tx Free Intr\n");
+                       nic->sw_err_stat->skb_null_tx_intr_handler_cnt++;
                        return;
                }
+               temp = (struct sk_buff **)&skb->cb;
+               *temp = head;
+               head = skb;
                pkt_cnt++;
 
                /* Updating the statistics block */
-               nic->dev->stats.tx_bytes += skb->len;
-               nic->mac_control.stats_info->sw_stat.mem_freed += skb->truesize;
-               dev_kfree_skb_irq(skb);
+               nic->stats.tx_bytes += skb->len;
+               stats->mem_freed += skb->truesize;
 
                get_info.offset++;
                if (get_info.offset == get_info.fifo_len + 1)
                        get_info.offset = 0;
                txdlp = (struct TxD *) fifo_data->list_info
-                   [get_info.offset].list_virt_addr;
+                       [get_info.offset].list_virt_addr;
                fifo_data->tx_curr_get_info.offset =
                    get_info.offset;
        }
@@ -3159,6 +4543,14 @@ static void tx_intr_handler(struct fifo_info *fifo_data)
        s2io_wake_tx_queue(fifo_data, pkt_cnt, nic->config.multiq);
 
        spin_unlock_irqrestore(&fifo_data->tx_lock, flags);
+
+       while (head) {
+               skb = head;
+               temp = (struct sk_buff **)&skb->cb;
+               head = *temp;
+               *temp = NULL;
+               dev_kfree_skb_irq(skb);
+       }
 }
 
 /**
@@ -3177,7 +4569,7 @@ static void s2io_mdio_write(u32 mmd_type, u64 addr, u16 value, struct net_device
        struct s2io_nic *sp = dev->priv;
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
 
-       //address transaction
+       /* address transaction */
        val64 = val64 | MDIO_MMD_INDX_ADDR(addr)
                        | MDIO_MMD_DEV_ADDR(mmd_type)
                        | MDIO_MMS_PRT_ADDR(0x0);
@@ -3186,7 +4578,7 @@ static void s2io_mdio_write(u32 mmd_type, u64 addr, u16 value, struct net_device
        writeq(val64, &bar0->mdio_control);
        udelay(100);
 
-       //Data transaction
+       /*Data transaction */
        val64 = 0x0;
        val64 = val64 | MDIO_MMD_INDX_ADDR(addr)
                        | MDIO_MMD_DEV_ADDR(mmd_type)
@@ -3252,6 +4644,7 @@ static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev)
        rval64 = rval64 >> 16;
        return rval64;
 }
+
 /**
  *  s2io_chk_xpak_counter - Function to check the status of the xpak counters
  *  @counter      : couter value to be updated
@@ -3262,42 +4655,42 @@ static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev)
  *  NONE
  */
 
-static void s2io_chk_xpak_counter(u64 *counter, u64 * regs_stat, u32 index, u16 flag, u16 type)
+static void s2io_chk_xpak_counter(u64 *counter, u64 *regs_stat, u32 index,
+       u16 flag, u16 type)
 {
        u64 mask = 0x3;
        u64 val64;
        int i;
-       for(i = 0; i <index; i++)
+
+       for (i = 0; i < index; i++)
                mask = mask << 0x2;
 
-       if(flag > 0)
-       {
+       if (flag > 0) {
                *counter = *counter + 1;
                val64 = *regs_stat & mask;
                val64 = val64 >> (index * 0x2);
                val64 = val64 + 1;
-               if(val64 == 3)
-               {
+               if (val64 == 3) {
                        switch(type)
                        {
                        case 1:
                                DBG_PRINT(ERR_DBG, "Take Xframe NIC out of "
-                                         "service. Excessive temperatures may "
-                                         "result in premature transceiver "
-                                         "failure \n");
-                       break;
+                                       "service. Excessive temperatures may "
+                                       "result in premature transceiver "
+                                       "failure \n");
+                               break;
                        case 2:
                                DBG_PRINT(ERR_DBG, "Take Xframe NIC out of "
-                                         "service Excessive bias currents may "
-                                         "indicate imminent laser diode "
-                                         "failure \n");
-                       break;
+                                       "service Excessive bias currents may "
+                                       "indicate imminent laser diode "
+                                       "failure \n");
+                               break;
                        case 3:
                                DBG_PRINT(ERR_DBG, "Take Xframe NIC out of "
-                                         "service Excessive laser output "
-                                         "power may saturate far-end "
-                                         "receiver\n");
-                       break;
+                                       "service Excessive laser output "
+                                       "power may saturate far-end "
+                                       "receiver\n");
+                               break;
                        default:
                                DBG_PRINT(ERR_DBG, "Incorrect XPAK Alarm "
                                          "type \n");
@@ -3307,9 +4700,8 @@ static void s2io_chk_xpak_counter(u64 *counter, u64 * regs_stat, u32 index, u16
                val64 = val64 << (index * 0x2);
                *regs_stat = (*regs_stat & (~mask)) | (val64);
 
-       } else {
+       } else
                *regs_stat = *regs_stat & (~mask);
-       }
 }
 
 /**
@@ -3328,22 +4720,20 @@ static void s2io_updt_xpak_counter(struct net_device *dev)
        u64 addr  = 0x0;
 
        struct s2io_nic *sp = dev->priv;
-       struct stat_block *stat_info = sp->mac_control.stats_info;
+       struct xpakStat *xpak_stat = sp->xpak_stat;
 
        /* Check the communication with the MDIO slave */
        addr = 0x0000;
        val64 = 0x0;
        val64 = s2io_mdio_read(MDIO_MMD_PMA_DEV_ADDR, addr, dev);
-       if((val64 == 0xFFFF) || (val64 == 0x0000))
-       {
+       if ((val64 == 0xFFFF) || (val64 == 0x0000)) {
                DBG_PRINT(ERR_DBG, "ERR: MDIO slave access failed - "
                          "Returned %llx\n", (unsigned long long)val64);
                return;
        }
 
        /* Check for the expecte value of 2040 at PMA address 0x0000 */
-       if(val64 != 0x2040)
-       {
+       if (val64 != 0x2040) {
                DBG_PRINT(ERR_DBG, "Incorrect value at PMA address 0x0000 - ");
                DBG_PRINT(ERR_DBG, "Returned: %llx- Expected: 0x2040\n",
                          (unsigned long long)val64);
@@ -3362,71 +4752,73 @@ static void s2io_updt_xpak_counter(struct net_device *dev)
 
        flag = CHECKBIT(val64, 0x7);
        type = 1;
-       s2io_chk_xpak_counter(&stat_info->xpak_stat.alarm_transceiver_temp_high,
-                               &stat_info->xpak_stat.xpak_regs_stat,
+       s2io_chk_xpak_counter(&xpak_stat->alarm_transceiver_temp_high,
+                               &xpak_stat->xpak_regs_stat,
                                0x0, flag, type);
 
-       if(CHECKBIT(val64, 0x6))
-               stat_info->xpak_stat.alarm_transceiver_temp_low++;
+       if (CHECKBIT(val64, 0x6))
+               xpak_stat->alarm_transceiver_temp_low++;
 
        flag = CHECKBIT(val64, 0x3);
        type = 2;
-       s2io_chk_xpak_counter(&stat_info->xpak_stat.alarm_laser_bias_current_high,
-                               &stat_info->xpak_stat.xpak_regs_stat,
+       s2io_chk_xpak_counter(&xpak_stat->alarm_laser_bias_current_high,
+                               &xpak_stat->xpak_regs_stat,
                                0x2, flag, type);
 
-       if(CHECKBIT(val64, 0x2))
-               stat_info->xpak_stat.alarm_laser_bias_current_low++;
+       if (CHECKBIT(val64, 0x2))
+               xpak_stat->alarm_laser_bias_current_low++;
 
        flag = CHECKBIT(val64, 0x1);
        type = 3;
-       s2io_chk_xpak_counter(&stat_info->xpak_stat.alarm_laser_output_power_high,
-                               &stat_info->xpak_stat.xpak_regs_stat,
+       s2io_chk_xpak_counter(&xpak_stat->alarm_laser_output_power_high,
+                               &xpak_stat->xpak_regs_stat,
                                0x4, flag, type);
 
-       if(CHECKBIT(val64, 0x0))
-               stat_info->xpak_stat.alarm_laser_output_power_low++;
+       if (CHECKBIT(val64, 0x0))
+               xpak_stat->alarm_laser_output_power_low++;
 
        /* Reading the Warning flags */
        addr = 0xA074;
        val64 = 0x0;
        val64 = s2io_mdio_read(MDIO_MMD_PMA_DEV_ADDR, addr, dev);
 
-       if(CHECKBIT(val64, 0x7))
-               stat_info->xpak_stat.warn_transceiver_temp_high++;
+       if (CHECKBIT(val64, 0x7))
+               xpak_stat->warn_transceiver_temp_high++;
 
-       if(CHECKBIT(val64, 0x6))
-               stat_info->xpak_stat.warn_transceiver_temp_low++;
+       if (CHECKBIT(val64, 0x6))
+               xpak_stat->warn_transceiver_temp_low++;
 
-       if(CHECKBIT(val64, 0x3))
-               stat_info->xpak_stat.warn_laser_bias_current_high++;
+       if (CHECKBIT(val64, 0x3))
+               xpak_stat->warn_laser_bias_current_high++;
 
-       if(CHECKBIT(val64, 0x2))
-               stat_info->xpak_stat.warn_laser_bias_current_low++;
+       if (CHECKBIT(val64, 0x2))
+               xpak_stat->warn_laser_bias_current_low++;
 
-       if(CHECKBIT(val64, 0x1))
-               stat_info->xpak_stat.warn_laser_output_power_high++;
+       if (CHECKBIT(val64, 0x1))
+               xpak_stat->warn_laser_output_power_high++;
 
-       if(CHECKBIT(val64, 0x0))
-               stat_info->xpak_stat.warn_laser_output_power_low++;
+       if (CHECKBIT(val64, 0x0))
+               xpak_stat->warn_laser_output_power_low++;
 }
 
 /**
  *  wait_for_cmd_complete - waits for a command to complete.
- *  @sp : private member of the device structure, which is a pointer to the
- *  s2io_nic structure.
- *  Description: Function that waits for a command to Write into RMAC
- *  ADDR DATA registers to be completed and returns either success or
- *  error depending on whether the command was complete or not.
+ *  @addr: address value
+ *  @busy_bit: bit in the register that needs to be checked
+ *  @bit_state: flag to check if bit is set or reset
+ *  Description: Function that waits for a command to be completed
+ *  and returns either success or error depending on whether the
+ *  command was complete or not.
  *  Return value:
- *   SUCCESS on success and FAILURE on failure.
+ *   SUCCESS or FAILURE.
  */
 
-static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit,
+static int wait_for_cmd_complete(void  __iomem *addr, u64 busy_bit,
                                int bit_state)
 {
-       int ret = FAILURE, cnt = 0, delay = 1;
+       int ret = FAILURE, cnt = 0;
        u64 val64;
+       int delay = 1;
 
        if ((bit_state != S2IO_BIT_RESET) && (bit_state != S2IO_BIT_SET))
                return FAILURE;
@@ -3439,31 +4831,38 @@ static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit,
                                break;
                        }
                } else {
-                       if (!(val64 & busy_bit)) {
+                       if (val64 & busy_bit) {
                                ret = SUCCESS;
                                break;
                        }
                }
 
-               if(in_interrupt())
+               if (in_interrupt())
                        mdelay(delay);
                else
                        msleep(delay);
 
                if (++cnt >= 10)
                        delay = 50;
+
        } while (cnt < 20);
        return ret;
 }
+
 /*
  * check_pci_device_id - Checks if the device id is supported
  * @id : device id
- * Description: Function to check if the pci device id is supported by driver.
+ * Description: Function to check if the pci device id is supported by the driver.
  * Return value: Actual device id if supported else PCI_ANY_ID
  */
 static u16 check_pci_device_id(u16 id)
 {
        switch (id) {
+#ifdef TITAN_LEGACY
+       case PCI_DEVICE_ID_TITAN_WIN:
+       case PCI_DEVICE_ID_TITAN_UNI:
+               return TITAN_DEVICE;
+#endif
        case PCI_DEVICE_ID_HERC_WIN:
        case PCI_DEVICE_ID_HERC_UNI:
                return XFRAME_II_DEVICE;
@@ -3485,41 +4884,40 @@ static u16 check_pci_device_id(u16 id)
  *  void.
  */
 
-static void s2io_reset(struct s2io_nic * sp)
+static void s2io_reset(struct s2io_nic *sp)
 {
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
        u64 val64;
        u16 subid, pci_cmd;
        int i;
        u16 val16;
-       unsigned long long up_cnt, down_cnt, up_time, down_time, reset_cnt;
-       unsigned long long mem_alloc_cnt, mem_free_cnt, watchdog_cnt;
+       struct swErrStat err_stat;
 
-       DBG_PRINT(INIT_DBG,"%s - Resetting XFrame card %s\n",
-                       __FUNCTION__, sp->dev->name);
+       DBG_PRINT(INIT_DBG, "%s - Resetting XFrame card %s\n",
+               __FUNCTION__, sp->dev->name);
 
        /* Back up  the PCI-X CMD reg, dont want to lose MMRBC, OST settings */
        pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER, &(pci_cmd));
 
        val64 = SW_RESET_ALL;
        writeq(val64, &bar0->sw_reset);
-       if (strstr(sp->product_name, "CX4")) {
+
+       if (strstr(sp->product_name, "CX4"))
                msleep(750);
-       }
        msleep(250);
+
        for (i = 0; i < S2IO_MAX_PCI_CONFIG_SPACE_REINIT; i++) {
 
                /* Restore the PCI state saved during initialization. */
-               pci_restore_state(sp->pdev);
+               pci_restore_state(sp->pdev, sp->config_space);
                pci_read_config_word(sp->pdev, 0x2, &val16);
                if (check_pci_device_id(val16) != (u16)PCI_ANY_ID)
                        break;
                msleep(200);
        }
 
-       if (check_pci_device_id(val16) == (u16)PCI_ANY_ID) {
-               DBG_PRINT(ERR_DBG,"%s SW_Reset failed!\n", __FUNCTION__);
-       }
+       if (check_pci_device_id(val16) == (u16)PCI_ANY_ID)
+               DBG_PRINT(ERR_DBG, "%s SW_Reset failed!\n", __FUNCTION__);
 
        pci_write_config_word(sp->pdev, PCIX_COMMAND_REGISTER, pci_cmd);
 
@@ -3531,8 +4929,10 @@ static void s2io_reset(struct s2io_nic * sp)
        /* restore mac_addr entries */
        do_s2io_restore_unicast_mc(sp);
 
+#ifdef CONFIG_PCI_MSI
        /* Restore the MSIX table entries from local variables */
        restore_xmsi_data(sp);
+#endif
 
        /* Clear certain PCI/PCI-X fields after reset */
        if (sp->device_type == XFRAME_II_DEVICE) {
@@ -3543,36 +4943,24 @@ static void s2io_reset(struct s2io_nic * sp)
                pci_write_config_dword(sp->pdev, 0x68, 0x7C);
 
                /* Clearing PCI_STATUS error reflected here */
-               writeq(s2BIT(62), &bar0->txpic_int_reg);
+               writeq(S2BIT(62), &bar0->txpic_int_reg);
        }
 
        /* Reset device statistics maintained by OS */
        memset(&sp->stats, 0, sizeof (struct net_device_stats));
 
-       up_cnt = sp->mac_control.stats_info->sw_stat.link_up_cnt;
-       down_cnt = sp->mac_control.stats_info->sw_stat.link_down_cnt;
-       up_time = sp->mac_control.stats_info->sw_stat.link_up_time;
-       down_time = sp->mac_control.stats_info->sw_stat.link_down_time;
-       reset_cnt = sp->mac_control.stats_info->sw_stat.soft_reset_cnt;
-       mem_alloc_cnt = sp->mac_control.stats_info->sw_stat.mem_allocated;
-       mem_free_cnt = sp->mac_control.stats_info->sw_stat.mem_freed;
-       watchdog_cnt = sp->mac_control.stats_info->sw_stat.watchdog_timer_cnt;
-       /* save link up/down time/cnt, reset/memory/watchdog cnt */
+       /* save all the software error statistics */
+       memcpy(&err_stat, &sp->mac_stat_info, sizeof(struct swErrStat));
+
        memset(sp->mac_control.stats_info, 0, sizeof(struct stat_block));
-       /* restore link up/down time/cnt, reset/memory/watchdog cnt */
-       sp->mac_control.stats_info->sw_stat.link_up_cnt = up_cnt;
-       sp->mac_control.stats_info->sw_stat.link_down_cnt = down_cnt;
-       sp->mac_control.stats_info->sw_stat.link_up_time = up_time;
-       sp->mac_control.stats_info->sw_stat.link_down_time = down_time;
-       sp->mac_control.stats_info->sw_stat.soft_reset_cnt = reset_cnt;
-       sp->mac_control.stats_info->sw_stat.mem_allocated = mem_alloc_cnt;
-       sp->mac_control.stats_info->sw_stat.mem_freed = mem_free_cnt;
-       sp->mac_control.stats_info->sw_stat.watchdog_timer_cnt = watchdog_cnt;
+
+       /* restore the software error statistics */
+       memcpy(&sp->mac_stat_info, &err_stat, sizeof(struct swErrStat));
 
        /* SXE-002: Configure link and activity LED to turn it off */
        subid = sp->pdev->subsystem_device;
        if (((subid & 0xFF) >= 0x07) &&
-           (sp->device_type == XFRAME_I_DEVICE)) {
+               (sp->device_type == XFRAME_I_DEVICE)) {
                val64 = readq(&bar0->gpio_control);
                val64 |= 0x0000800000000000ULL;
                writeq(val64, &bar0->gpio_control);
@@ -3602,11 +4990,11 @@ static void s2io_reset(struct s2io_nic * sp)
  *  SUCCESS on success and FAILURE on failure.
  */
 
-static int s2io_set_swapper(struct s2io_nic * sp)
+static int s2io_set_swapper(struct s2io_nic *sp)
 {
        struct net_device *dev = sp->dev;
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
-       u64 val64, valt, valr;
+       u64 val64, valt, valr, sw_wr, rth_wr;
 
        /*
         * Set proper endian settings and verify the same by reading
@@ -3616,12 +5004,12 @@ static int s2io_set_swapper(struct s2io_nic * sp)
        val64 = readq(&bar0->pif_rd_swapper_fb);
        if (val64 != 0x0123456789ABCDEFULL) {
                int i = 0;
-               u64 value[] = { 0xC30000C3C30000C3ULL,   /* FE=1, SE=1 */
-                               0x8100008181000081ULL,  /* FE=1, SE=0 */
-                               0x4200004242000042ULL,  /* FE=0, SE=1 */
-                               0};                     /* FE=0, SE=0 */
+               u64 value[] = { 0xC30000C3C30000C3ULL,  /* FE=1, SE=1 */
+                               0x8100008181000081ULL,  /* FE=1, SE=0 */
+                               0x4200004242000042ULL,  /* FE=0, SE=1 */
+                               0};                     /* FE=0, SE=0 */
 
-               while(i<4) {
+               while (i < 4) {
                        writeq(value[i], &bar0->swapper_ctrl);
                        val64 = readq(&bar0->pif_rd_swapper_fb);
                        if (val64 == 0x0123456789ABCDEFULL)
@@ -3636,22 +5024,21 @@ static int s2io_set_swapper(struct s2io_nic * sp)
                        return FAILURE;
                }
                valr = value[i];
-       } else {
+       } else
                valr = readq(&bar0->swapper_ctrl);
-       }
 
        valt = 0x0123456789ABCDEFULL;
        writeq(valt, &bar0->xmsi_address);
        val64 = readq(&bar0->xmsi_address);
 
-       if(val64 != valt) {
+       if (val64 != valt) {
                int i = 0;
                u64 value[] = { 0x00C3C30000C3C300ULL,  /* FE=1, SE=1 */
                                0x0081810000818100ULL,  /* FE=1, SE=0 */
                                0x0042420000424200ULL,  /* FE=0, SE=1 */
                                0};                     /* FE=0, SE=0 */
 
-               while(i<4) {
+               while (i < 4) {
                        writeq((value[i] | valr), &bar0->swapper_ctrl);
                        writeq(valt, &bar0->xmsi_address);
                        val64 = readq(&bar0->xmsi_address);
@@ -3659,7 +5046,7 @@ static int s2io_set_swapper(struct s2io_nic * sp)
                                break;
                        i++;
                }
-               if(i == 4) {
+               if (i == 4) {
                        unsigned long long x = val64;
                        DBG_PRINT(ERR_DBG, "Write failed, Xmsi_addr ");
                        DBG_PRINT(ERR_DBG, "reads:0x%llx\n", x);
@@ -3668,6 +5055,9 @@ static int s2io_set_swapper(struct s2io_nic * sp)
        }
        val64 = readq(&bar0->swapper_ctrl);
        val64 &= 0xFFFF000000000000ULL;
+       sw_wr = (val64 & vBIT(3, 8, 2));
+       rth_wr = (sw_wr >> 2);
+       val64 |= rth_wr;
 
 #ifdef  __BIG_ENDIAN
        /*
@@ -3730,6 +5120,7 @@ static int s2io_set_swapper(struct s2io_nic * sp)
        return SUCCESS;
 }
 
+#ifdef CONFIG_PCI_MSI
 static int wait_for_msix_trans(struct s2io_nic *nic, int i)
 {
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
@@ -3738,7 +5129,7 @@ static int wait_for_msix_trans(struct s2io_nic *nic, int i)
 
        do {
                val64 = readq(&bar0->xmsi_access);
-               if (!(val64 & s2BIT(15)))
+               if (!(val64 & S2BIT(15)))
                        break;
                mdelay(1);
                cnt++;
@@ -3755,19 +5146,18 @@ static void restore_xmsi_data(struct s2io_nic *nic)
 {
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
        u64 val64;
-       int i, msix_index;
-
+       int i, msix_indx;
 
        if (nic->device_type == XFRAME_I_DEVICE)
                return;
 
-       for (i=0; i < MAX_REQUESTED_MSI_X; i++) {
-               msix_index = (i) ? ((i-1) * 8 + 1): 0;
+       for (i = 0; i < MAX_REQUESTED_MSI_X; i++) {
+               msix_indx = (i) ? ((i-1) * 8 + 1): 0;
                writeq(nic->msix_info[i].addr, &bar0->xmsi_address);
                writeq(nic->msix_info[i].data, &bar0->xmsi_data);
-               val64 = (s2BIT(7) | s2BIT(15) | vBIT(msix_index, 26, 6));
+               val64 = (S2BIT(7) | S2BIT(15) | vBIT(msix_indx, 26, 6));
                writeq(val64, &bar0->xmsi_access);
-               if (wait_for_msix_trans(nic, msix_index)) {
+               if (wait_for_msix_trans(nic, msix_indx)) {
                        DBG_PRINT(ERR_DBG, "failed in %s\n", __FUNCTION__);
                        continue;
                }
@@ -3778,17 +5168,17 @@ static void store_xmsi_data(struct s2io_nic *nic)
 {
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
        u64 val64, addr, data;
-       int i, msix_index;
+       int i, msix_indx;
 
        if (nic->device_type == XFRAME_I_DEVICE)
                return;
 
        /* Store and display */
-       for (i=0; i < MAX_REQUESTED_MSI_X; i++) {
-               msix_index = (i) ? ((i-1) * 8 + 1): 0;
-               val64 = (s2BIT(15) | vBIT(msix_index, 26, 6));
+       for (i = 0; i < MAX_REQUESTED_MSI_X; i++) {
+               msix_indx = (i) ? ((i-1) * 8 + 1): 0;
+               val64 = (S2BIT(15) | vBIT(msix_indx, 26, 6));
                writeq(val64, &bar0->xmsi_access);
-               if (wait_for_msix_trans(nic, msix_index)) {
+               if (wait_for_msix_trans(nic, msix_indx)) {
                        DBG_PRINT(ERR_DBG, "failed in %s\n", __FUNCTION__);
                        continue;
                }
@@ -3809,32 +5199,23 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
        int ret, i, j, msix_indx = 1;
 
        nic->entries = kmalloc(nic->num_entries * sizeof(struct msix_entry),
-                              GFP_KERNEL);
-       if (!nic->entries) {
-               DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n", \
+                               GFP_KERNEL);
+       if (nic->entries == NULL) {
+               DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n",
                        __FUNCTION__);
-               nic->mac_control.stats_info->sw_stat.mem_alloc_fail_cnt++;
                return -ENOMEM;
        }
-       nic->mac_control.stats_info->sw_stat.mem_allocated
-               += (nic->num_entries * sizeof(struct msix_entry));
-
        memset(nic->entries, 0, nic->num_entries * sizeof(struct msix_entry));
 
        nic->s2io_entries =
                kmalloc(nic->num_entries * sizeof(struct s2io_msix_entry),
                                   GFP_KERNEL);
-       if (!nic->s2io_entries) {
+       if (nic->s2io_entries == NULL) {
                DBG_PRINT(INFO_DBG, "%s: Memory allocation failed\n",
                        __FUNCTION__);
-               nic->mac_control.stats_info->sw_stat.mem_alloc_fail_cnt++;
                kfree(nic->entries);
-               nic->mac_control.stats_info->sw_stat.mem_freed
-                       += (nic->num_entries * sizeof(struct msix_entry));
                return -ENOMEM;
        }
-        nic->mac_control.stats_info->sw_stat.mem_allocated
-               += (nic->num_entries * sizeof(struct s2io_msix_entry));
        memset(nic->s2io_entries, 0,
                nic->num_entries * sizeof(struct s2io_msix_entry));
 
@@ -3863,15 +5244,17 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
        readq(&bar0->rx_mat);
 
        ret = pci_enable_msix(nic->pdev, nic->entries, nic->num_entries);
+
        /* We fail init if error or we get less vectors than min required */
        if (ret) {
-               DBG_PRINT(ERR_DBG, "%s: Enabling MSIX failed\n", nic->dev->name);
+               DBG_PRINT(ERR_DBG, "s2io: Enabling MSIX failed\n");
+               if (ret > 0)
+                       DBG_PRINT(ERR_DBG, "s2io: Requested for %d, " \
+                               "but got only %d vector(s), try with " \
+                               "rx_ring_num = %d\n",
+                               nic->num_entries, ret, (ret-1));
                kfree(nic->entries);
-               nic->mac_control.stats_info->sw_stat.mem_freed
-                       += (nic->num_entries * sizeof(struct msix_entry));
                kfree(nic->s2io_entries);
-               nic->mac_control.stats_info->sw_stat.mem_freed
-                       += (nic->num_entries * sizeof(struct s2io_msix_entry));
                nic->entries = NULL;
                nic->s2io_entries = NULL;
                return -ENOMEM;
@@ -3889,7 +5272,12 @@ static int s2io_enable_msi_x(struct s2io_nic *nic)
 }
 
 /* Handle software interrupt used during MSI(X) test */
-static irqreturn_t s2io_test_intr(int irq, void *dev_id)
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19))
+static irqreturn_t __devinit s2io_test_intr(int irq, void *dev_id,
+                                           struct pt_regs *regs)
+#else
+static irqreturn_t __devinit s2io_test_intr(int irq, void *dev_id)
+#endif
 {
        struct s2io_nic *sp = dev_id;
 
@@ -3900,7 +5288,7 @@ static irqreturn_t s2io_test_intr(int irq, void *dev_id)
 }
 
 /* Test interrupt path by forcing a a software IRQ */
-static int s2io_test_msi(struct s2io_nic *sp)
+static int __devinit s2io_test_msi(struct s2io_nic *sp)
 {
        struct pci_dev *pdev = sp->pdev;
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
@@ -3908,14 +5296,14 @@ static int s2io_test_msi(struct s2io_nic *sp)
        u64 val64, saved64;
 
        err = request_irq(sp->entries[1].vector, s2io_test_intr, 0,
-                       sp->name, sp);
+               sp->name, sp);
        if (err) {
-               DBG_PRINT(ERR_DBG, "%s: PCI %s: cannot assign irq %d\n",
-                      sp->dev->name, pci_name(pdev), pdev->irq);
+               DBG_PRINT(ERR_DBG, "s2io: PCI %s: cannot assign irq %d\n",
+                       pci_name(pdev), pdev->irq);
                return err;
        }
 
-       init_waitqueue_head (&sp->msi_wait);
+       init_waitqueue_head(&sp->msi_wait);
        sp->msi_detected = 0;
 
        saved64 = val64 = readq(&bar0->scheduled_int_ctrl);
@@ -3928,9 +5316,8 @@ static int s2io_test_msi(struct s2io_nic *sp)
 
        if (!sp->msi_detected) {
                /* MSI(X) test failed, go back to INTx mode */
-               DBG_PRINT(ERR_DBG, "%s: PCI %s: No interrupt was generated "
-                       "using MSI(X) during test\n", sp->dev->name,
-                       pci_name(pdev));
+               DBG_PRINT(ERR_DBG, "s2io: PCI %s: No interrupt was generated "
+                       "using MSI(X) during test\n", pci_name(pdev));
 
                err = -EOPNOTSUPP;
        }
@@ -3941,8 +5328,10 @@ static int s2io_test_msi(struct s2io_nic *sp)
 
        return err;
 }
+#endif
 
-static void remove_msix_isr(struct s2io_nic *sp)
+#ifdef CONFIG_PCI_MSI
+static void do_rem_msix_isr(struct s2io_nic *sp)
 {
        int i;
        u16 msi_control;
@@ -3952,6 +5341,9 @@ static void remove_msix_isr(struct s2io_nic *sp)
                        MSIX_REGISTERED_SUCCESS) {
                        int vector = sp->entries[i].vector;
                        void *arg = sp->s2io_entries[i].arg;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
+                       s2io_synchronize_irq(vector);
+#endif
                        free_irq(vector, arg);
                }
        }
@@ -3967,11 +5359,15 @@ static void remove_msix_isr(struct s2io_nic *sp)
 
        pci_disable_msix(sp->pdev);
 }
+#endif
 
-static void remove_inta_isr(struct s2io_nic *sp)
+static void do_rem_inta_isr(struct s2io_nic *sp)
 {
        struct net_device *dev = sp->dev;
-
+       /* Waiting till all Interrupt handlers are complete */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
+       s2io_synchronize_irq(sp->pdev->irq);
+#endif
        free_irq(sp->pdev->irq, dev);
 }
 
@@ -3996,6 +5392,10 @@ static int s2io_open(struct net_device *dev)
        struct s2io_nic *sp = dev->priv;
        int err = 0;
 
+#ifdef CONFIG_PCI_MSI
+       struct swDbgStat *stats = sp->sw_dbg_stat;
+#endif
+
        /*
         * Make sure you have link off by default every time
         * Nic is initialized
@@ -4017,22 +5417,27 @@ static int s2io_open(struct net_device *dev)
                err = -ENODEV;
                goto hw_init_failed;
        }
+
        s2io_start_all_tx_queue(sp);
+
        return 0;
 
 hw_init_failed:
+#ifdef CONFIG_PCI_MSI
        if (sp->config.intr_type == MSI_X) {
                if (sp->entries) {
                        kfree(sp->entries);
-                       sp->mac_control.stats_info->sw_stat.mem_freed
-                       += (sp->num_entries * sizeof(struct msix_entry));
+                       stats->mem_freed +=
+                               (sp->num_entries * sizeof(struct msix_entry));
                }
                if (sp->s2io_entries) {
                        kfree(sp->s2io_entries);
-                       sp->mac_control.stats_info->sw_stat.mem_freed
-                       += (sp->num_entries * sizeof(struct s2io_msix_entry));
+                       stats->mem_freed +=
+                               (sp->num_entries *
+                               sizeof(struct s2io_msix_entry));
                }
        }
+#endif
        return err;
 }
 
@@ -4052,24 +5457,16 @@ hw_init_failed:
 static int s2io_close(struct net_device *dev)
 {
        struct s2io_nic *sp = dev->priv;
-       struct config_param *config = &sp->config;
-       u64 tmp64;
-       int offset;
 
-       /* Return if the device is already closed               *
-       *  Can happen when s2io_card_up failed in change_mtu    *
+       /* Return if the device is already closed               *
+       *  Can happen when s2io_card_up failed in change_mtu    *
        */
        if (!is_s2io_card_up(sp))
                return 0;
 
        s2io_stop_all_tx_queue(sp);
-       /* delete all populated mac entries */
-       for (offset = 1; offset < config->max_mc_addr; offset++) {
-               tmp64 = do_s2io_read_unicast_mc(sp, offset);
-               if (tmp64 != S2IO_DISABLE_MAC_ENTRY)
-                       do_s2io_delete_unicast_mc(sp, tmp64);
-       }
 
+       /* Reset card, free Tx and Rx buffers. */
        s2io_card_down(sp);
 
        return 0;
@@ -4087,81 +5484,104 @@ static int s2io_close(struct net_device *dev)
  *  Return value:
  *  0 on success & 1 on failure.
  */
-
 static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
 {
        struct s2io_nic *sp = dev->priv;
-       u16 frg_cnt, frg_len, i, queue, queue_len, put_off, get_off;
-       register u64 val64;
+       struct XENA_dev_config __iomem *bar0 = sp->bar0;
+       u16 frg_cnt, frg_len, queue_len, put_off, get_off;
+       u64 val64;
+       u32 val32;
        struct TxD *txdp;
        struct TxFIFO_element __iomem *tx_fifo;
        unsigned long flags = 0;
        u16 vlan_tag = 0;
-       struct fifo_info *fifo = NULL;
        struct mac_info *mac_control;
-       struct config_param *config;
-       int do_spin_lock = 1;
+       struct fifo_info *fifo = NULL;
+       int txd_cnt = 0;
        int offload_type;
        int enable_per_list_interrupt = 0;
-       struct swStat *stats = &sp->mac_control.stats_info->sw_stat;
+       int do_spin_lock = 1;
+       struct swDbgStat *stats = sp->sw_dbg_stat;
+       u16 counter = sp->other_fifo_idx;
 
        mac_control = &sp->mac_control;
-       config = &sp->config;
 
        DBG_PRINT(TX_DBG, "%s: In Neterion Tx routine\n", dev->name);
 
+       /* A buffer with no data will be dropped */
        if (unlikely(skb->len <= 0)) {
                DBG_PRINT(TX_DBG, "%s:Buffer has no data..\n", dev->name);
                dev_kfree_skb_any(skb);
                return 0;
        }
 
-       if (!is_s2io_card_up(sp)) {
+       /* In debug mode, return if a serious error had occured */
+       if (unlikely(1 == sp->serious_err) && unlikely(0 == sp->exec_mode)) {
+               dev_kfree_skb_any(skb);
+               return 0;
+       }
+
+       if (unlikely(!is_s2io_card_up(sp))) {
                DBG_PRINT(TX_DBG, "%s: Card going down for reset\n",
                          dev->name);
-               dev_kfree_skb(skb);
+               dev_kfree_skb_any(skb);
                return 0;
        }
 
-       queue = 0;
        if (sp->vlgrp && vlan_tx_tag_present(skb))
+               /* Get Fifo number to Transmit based on vlan priority */
                vlan_tag = vlan_tx_tag_get(skb);
-       if (sp->config.tx_steering_type == TX_DEFAULT_STEERING) {
+
+       if (sp->config.tx_steering_type == TX_STEERING_DEFAULT) {
                if (skb->protocol == htons(ETH_P_IP)) {
                        struct iphdr *ip;
                        struct tcphdr *th;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22))
                        ip = ip_hdr(skb);
-
+#else
+                       ip = skb->nh.iph;
+#endif
                        if ((ip->frag_off & htons(IP_OFFSET|IP_MF)) == 0) {
                                th = (struct tcphdr *)(((unsigned char *)ip) +
                                                ip->ihl*4);
 
                                if (ip->protocol == IPPROTO_TCP) {
                                        queue_len = sp->total_tcp_fifos;
-                                       queue = (ntohs(th->source) +
-                                                       ntohs(th->dest)) &
+                                       counter = (ntohs(th->source) + ntohs(th->dest)) &
                                            sp->fifo_selector[queue_len - 1];
-                                       if (queue >= queue_len)
-                                               queue = queue_len - 1;
+                                       if (counter >= queue_len)
+                                               counter = queue_len - 1;
                                } else if (ip->protocol == IPPROTO_UDP) {
                                        queue_len = sp->total_udp_fifos;
-                                       queue = (ntohs(th->source) +
-                                                       ntohs(th->dest)) &
+                                       counter = (ntohs(th->source) + ntohs(th->dest)) &
                                            sp->fifo_selector[queue_len - 1];
-                                       if (queue >= queue_len)
-                                               queue = queue_len - 1;
-                                       queue += sp->udp_fifo_idx;
+                                       if (counter >= queue_len)
+                                               counter = queue_len - 1;
+                                       counter += sp->udp_fifo_idx;
                                        if (skb->len > 1024)
                                                enable_per_list_interrupt = 1;
+#ifdef NETIF_F_LLTX
                                        do_spin_lock = 0;
+#endif
                                }
                        }
                }
-       } else if (sp->config.tx_steering_type == TX_PRIORITY_STEERING)
-               /* get fifo number based on skb->priority value */
-               queue = config->fifo_mapping
-                                       [skb->priority & (MAX_TX_FIFOS - 1)];
-       fifo = &mac_control->fifos[queue];
+       } else if (sp->config.tx_steering_type == TX_PRIORITY_STEERING) {
+               counter = s2io_get_tx_priority(skb, vlan_tag);
+               counter = sp->fifo_mapping[counter];
+       } else if (sp->config.tx_steering_type == TX_VLAN_STEERING) {
+               u16 vlan_id = vlan_tag & VLAN_VID_MASK;
+
+               if (vlan_id < VLAN_VID_MASK) {
+                       if (S2IO_INVALID_RING != sp->vlan_array[vlan_id])
+                               counter = sp->vlan_array[vlan_id];
+
+                       if (counter > sp->config.tx_fifo_num)
+                               counter = 0;
+               }
+       }
+
+       fifo = &mac_control->fifos[counter];
 
        if (do_spin_lock)
                spin_lock_irqsave(&fifo->tx_lock, flags);
@@ -4170,18 +5590,20 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                        return NETDEV_TX_LOCKED;
        }
 
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
        if (sp->config.multiq) {
                if (__netif_subqueue_stopped(dev, fifo->fifo_no)) {
                        spin_unlock_irqrestore(&fifo->tx_lock, flags);
                        return NETDEV_TX_BUSY;
                }
-       } else if (unlikely(fifo->queue_state == FIFO_QUEUE_STOP)) {
+       } else
+#endif
+       if (unlikely(fifo->queue_state == FIFO_QUEUE_STOP)) {
                if (netif_queue_stopped(dev)) {
                        spin_unlock_irqrestore(&fifo->tx_lock, flags);
                        return NETDEV_TX_BUSY;
                }
        }
-
        put_off = (u16) fifo->tx_curr_put_info.offset;
        get_off = (u16) fifo->tx_curr_get_info.offset;
        txdp = (struct TxD *) fifo->list_info[put_off].list_virt_addr;
@@ -4192,21 +5614,31 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                   ((put_off+1) == queue_len ? 0 : (put_off+1)) == get_off) {
                DBG_PRINT(TX_DBG, "Error in xmit, No free TXDs.\n");
                s2io_stop_tx_queue(sp, fifo->fifo_no);
-               dev_kfree_skb(skb);
+
                spin_unlock_irqrestore(&fifo->tx_lock, flags);
+               dev_kfree_skb(skb);
                return 0;
        }
 
        offload_type = s2io_offload_type(skb);
+
+       /* only txd0 Buffer pointer, Buffer length changes depending upon
+        * whether amd_fix is enabled, or UFO is enabled. Rest all bits of
+        * txd0 will remain same so lets set them in the beginning itself
+        * before we start processing the txds so that we can reduce number of
+        * if conditions
+        */
+#ifdef NETIF_F_TSO
        if (offload_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) {
                txdp->Control_1 |= TXD_TCP_LSO_EN;
                txdp->Control_1 |= TXD_TCP_LSO_MSS(s2io_tcp_mss(skb));
        }
-       if (skb->ip_summed == CHECKSUM_PARTIAL) {
+#endif
+       if (skb->ip_summed == CHECKSUM_PARTIAL)
                txdp->Control_2 |=
-                   (TXD_TX_CKO_IPV4_EN | TXD_TX_CKO_TCP_EN |
-                    TXD_TX_CKO_UDP_EN);
-       }
+                       (TXD_TX_CKO_IPV4_EN | TXD_TX_CKO_TCP_EN |
+                       TXD_TX_CKO_UDP_EN);
+
        txdp->Control_1 |= TXD_GATHER_CODE_FIRST;
        txdp->Control_1 |= TXD_LIST_OWN_XENA;
        txdp->Control_2 |= TXD_INT_NUMBER(fifo->fifo_no);
@@ -4217,8 +5649,9 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                txdp->Control_2 |= TXD_VLAN_ENABLE;
                txdp->Control_2 |= TXD_VLAN_TAG(vlan_tag);
        }
-
        frg_len = skb->len - skb->data_len;
+
+#ifdef NETIF_F_UFO
        if (offload_type == SKB_GSO_UDP) {
                int ufo_size;
 
@@ -4228,26 +5661,29 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
                txdp->Control_1 |= TXD_UFO_MSS(ufo_size);
                txdp->Control_1 |= TXD_BUFFER0_SIZE(8);
 #ifdef __BIG_ENDIAN
-               /* both variants do cpu_to_be64(be32_to_cpu(...)) */
                fifo->ufo_in_band_v[put_off] =
-                               (__force u64)skb_shinfo(skb)->ip6_frag_id;
+                               (u64)skb_shinfo(skb)->ip6_frag_id;
 #else
                fifo->ufo_in_band_v[put_off] =
-                               (__force u64)skb_shinfo(skb)->ip6_frag_id << 32;
+                               (u64)skb_shinfo(skb)->ip6_frag_id << 32;
 #endif
                txdp->Host_Control = (unsigned long)fifo->ufo_in_band_v;
                txdp->Buffer_Pointer = pci_map_single(sp->pdev,
                                        fifo->ufo_in_band_v,
                                        sizeof(u64), PCI_DMA_TODEVICE);
-               if (pci_dma_mapping_error(sp->pdev, txdp->Buffer_Pointer))
-                       goto pci_map_failed;
+               if ((txdp->Buffer_Pointer == 0) ||
+                       (txdp->Buffer_Pointer == DMA_ERROR_CODE))
+                               goto pci_map_failed;
                txdp++;
        }
+#endif
 
        txdp->Buffer_Pointer = pci_map_single
-           (sp->pdev, skb->data, frg_len, PCI_DMA_TODEVICE);
-       if (pci_dma_mapping_error(sp->pdev, txdp->Buffer_Pointer))
-               goto pci_map_failed;
+               (sp->pdev, skb->data, frg_len, PCI_DMA_TODEVICE);
+
+       if ((txdp->Buffer_Pointer == 0) ||
+               (txdp->Buffer_Pointer == DMA_ERROR_CODE))
+                       goto pci_map_failed;
 
        txdp->Host_Control = (unsigned long) skb;
        txdp->Control_1 |= TXD_BUFFER0_SIZE(frg_len);
@@ -4256,15 +5692,15 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
 
        frg_cnt = skb_shinfo(skb)->nr_frags;
        /* For fragmented SKB. */
-       for (i = 0; i < frg_cnt; i++) {
-               skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+       for (counter = 0; counter < frg_cnt; counter++) {
+               skb_frag_t *frag = &skb_shinfo(skb)->frags[counter];
                /* A '0' length fragment will be ignored */
                if (!frag->size)
                        continue;
                txdp++;
                txdp->Buffer_Pointer = (u64) pci_map_page
-                   (sp->pdev, frag->page, frag->page_offset,
-                    frag->size, PCI_DMA_TODEVICE);
+                       (sp->pdev, frag->page, frag->page_offset,
+                       frag->size, PCI_DMA_TODEVICE);
                txdp->Control_1 = TXD_BUFFER0_SIZE(frag->size);
                if (offload_type == SKB_GSO_UDP)
                        txdp->Control_1 |= TXD_UFO_EN;
@@ -4274,18 +5710,36 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
        if (offload_type == SKB_GSO_UDP)
                frg_cnt++; /* as Txd0 was used for inband header */
 
-       tx_fifo = mac_control->tx_FIFO_start[queue];
+       tx_fifo = mac_control->tx_FIFO_start[fifo->fifo_no];
        val64 = fifo->list_info[put_off].list_phy_addr;
        writeq(val64, &tx_fifo->TxDL_Pointer);
 
-       val64 = (TX_FIFO_LAST_TXD_NUM(frg_cnt) | TX_FIFO_FIRST_LIST |
-                TX_FIFO_LAST_LIST);
+       wmb();
+
+       val64 = (TX_FIFO_LAST_TXD_NUM(txd_cnt + frg_cnt) | TX_FIFO_FIRST_LIST |
+               TX_FIFO_LAST_LIST);
        if (offload_type)
                val64 |= TX_FIFO_SPECIAL_FUNC;
 
        writeq(val64, &tx_fifo->List_Control);
 
-       mmiowb();
+       val32 = readl(&bar0->general_int_status);
+       /* if the returned value is all F's free skb */
+       if (unlikely(val32 == S2IO_32_BIT_MINUS_ONE)) {
+               s2io_stop_tx_queue(sp, fifo->fifo_no);
+
+               txdp = fifo->list_info[put_off].list_virt_addr;
+               skb = s2io_txdl_getskb(fifo, txdp, put_off);
+               spin_unlock_irqrestore(&fifo->tx_lock, flags);
+               if (skb == NULL) {
+                       DBG_PRINT(TX_DBG, "%s: Null skb ",
+                       __FUNCTION__);
+                       sp->mac_stat_info->skb_null_s2io_xmit_cnt++;
+                       return 0;
+               }
+               dev_kfree_skb(skb);
+               return 0;
+       }
 
        put_off++;
        if (put_off == fifo->tx_curr_put_info.fifo_len + 1)
@@ -4294,17 +5748,19 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
 
        /* Avoid "put" pointer going beyond "get" pointer */
        if (((put_off+1) == queue_len ? 0 : (put_off+1)) == get_off) {
-               sp->mac_control.stats_info->sw_stat.fifo_full_cnt++;
+               fifo->tx_fifo_stat->fifo_full_cnt++;
                DBG_PRINT(TX_DBG,
-                         "No free TxDs for xmit, Put: 0x%x Get:0x%x\n",
-                         put_off, get_off);
+                       "No free TxDs for xmit, Put: 0x%x Get:0x%x\n",
+                       put_off, get_off);
                s2io_stop_tx_queue(sp, fifo->fifo_no);
        }
-       mac_control->stats_info->sw_stat.mem_allocated += skb->truesize;
+       stats->tmac_frms_q[fifo->fifo_no]++;
+       stats->mem_allocated += skb->truesize;
        dev->trans_start = jiffies;
+
        spin_unlock_irqrestore(&fifo->tx_lock, flags);
 
-       if (sp->config.intr_type == MSI_X)
+       if(sp->config.intr_type == MSI_X)
                tx_intr_handler(fifo);
 
        return 0;
@@ -4312,8 +5768,8 @@ pci_map_failed:
        stats->pci_map_fail_cnt++;
        s2io_stop_tx_queue(sp, fifo->fifo_no);
        stats->mem_freed += skb->truesize;
-       dev_kfree_skb(skb);
        spin_unlock_irqrestore(&fifo->tx_lock, flags);
+       dev_kfree_skb(skb);
        return 0;
 }
 
@@ -4324,38 +5780,152 @@ s2io_alarm_handle(unsigned long data)
        struct net_device *dev = sp->dev;
 
        s2io_handle_errors(dev);
-       mod_timer(&sp->alarm_timer, jiffies + HZ / 2);
+
+       mod_timer(&sp->alarm_timer, jiffies + HZ/2);
+}
+
+
+/**
+ *  dynamic_rti - Modifies receive traffic interrupt scheme during run time
+ *  @ring: pointer to receive ring structure
+ *  Description: The function configures receive traffic interrupts
+ *  Return Value: Nothing
+ */
+
+void dynamic_rti(struct ring_info *ring)
+{
+       struct s2io_nic *nic = ring->nic;
+       struct XENA_dev_config __iomem *bar0 = nic->bar0;
+       u64 val64;
+
+       val64 = RTI_DATA1_MEM_RX_TIMER_VAL(ring->rx_timer_val);
+
+       val64 |= RTI_DATA1_MEM_RX_URNG_A(ring->urange_a) |
+               RTI_DATA1_MEM_RX_URNG_B(ring->urange_b) |
+               RTI_DATA1_MEM_RX_URNG_C(ring->urange_c) |
+               RTI_DATA1_MEM_RX_TIMER_AC_EN;
+       writeq(val64, &bar0->rti_data1_mem);
+
+       val64 = RTI_DATA2_MEM_RX_UFC_A(ring->ufc_a) |
+               RTI_DATA2_MEM_RX_UFC_B(ring->ufc_b)|
+               RTI_DATA2_MEM_RX_UFC_C(ring->ufc_c)|
+               RTI_DATA2_MEM_RX_UFC_D(ring->ufc_d);
+       writeq(val64, &bar0->rti_data2_mem);
+
+       val64 = RTI_CMD_MEM_WE | RTI_CMD_MEM_STROBE_NEW_CMD
+                       | RTI_CMD_MEM_OFFSET(ring->ring_no);
+       writeq(val64, &bar0->rti_command_mem);
+
+       return;
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
+/**
+ *  adaptive_coalesce_rx_interrupts - Changes the interrupt coalescing
+ *  if the interrupts are not within a range
+ *  @ring: pointer to receive ring structure
+ *  Description: The function increases of decreases the packet counts within
+ *  the ranges of traffic utilization, if the interrupts due to this ring are
+ *  not within a fixed range.
+ *  Return Value: Nothing
+ */
+static void adaptive_coalesce_rx_interrupts(struct ring_info *ring)
+{
+       int cnt = 0;
+
+       ring->interrupt_count++;
+       if (jiffies > ring->jiffies + HZ/100) {
+               ring->jiffies = jiffies;
+               if (ring->interrupt_count > MAX_INTERRUPT_COUNT) {
+                       if (ring->ufc_a < MAX_RX_UFC_A) {
+                               ring->ufc_a++;
+                               ring->rx_timer_val >>= 5;
+                               if (ring->rx_timer_val <= 0)
+                                       ring->rx_timer_val = MIN_RX_TIMER_VAL;
+                               cnt++;
+                       }
+               } else if (ring->interrupt_count < MAX_INTERRUPT_COUNT) {
+                       if (ring->ufc_a > MIN_RX_UFC_A) {
+                               ring->ufc_a--;
+                               ring->rx_timer_val <<= 5;
+                               if (ring->rx_timer_val >
+                                       ring->rx_timer_val_saved)
+                                       ring->rx_timer_val =
+                                               ring->rx_timer_val_saved;
+                               cnt++;
+                       }
+               }
+
+               if (cnt)
+                       dynamic_rti(ring);
+
+               ring->interrupt_count = 0;
+       }
 }
+#endif
+
 
+#ifdef CONFIG_PCI_MSI
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19))
+static irqreturn_t
+s2io_msix_ring_handle(int irq, void *dev_id, struct pt_regs *regs)
+#else
 static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id)
+#endif
 {
        struct ring_info *ring = (struct ring_info *)dev_id;
        struct s2io_nic *sp = ring->nic;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
        struct net_device *dev = sp->dev;
+#endif
 
-       if (unlikely(!is_s2io_card_up(sp)))
+       if (IRQ_HANDLED == S2IO_RING_IN_USE(ring))
                return IRQ_HANDLED;
 
-       if (sp->config.napi) {
-               u8 __iomem *addr = NULL;
-               u8 val8 = 0;
+       /*Increment the per ring msix interrupt counter*/
+       ring->msix_intr_cnt++;
+
+       /* In debug mode, return if a serious error has occured */
+       if (sp->serious_err && (0 == sp->exec_mode)) {
+               S2IO_RING_DONE(ring);
+               return IRQ_NONE;
+       }
 
-               addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
+       if (unlikely(!is_s2io_card_up(sp))) {
+               S2IO_RING_DONE(ring);
+               return IRQ_NONE;
+       }
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
+       if (ring->config_napi) {
+               u8 *addr = NULL, val8 = 0;
+               if (ring->aggr_ack)
+                       adaptive_coalesce_rx_interrupts(ring);
+
+               addr = (u8 *)&bar0->xmsi_mask_reg;
                addr += (7 - ring->ring_no);
                val8 = (ring->ring_no == 0) ? 0x7f : 0xff;
                writeb(val8, addr);
                val8 = readb(addr);
                netif_rx_schedule(dev, &ring->napi);
-       } else {
+       } else
+#endif
+       {
                rx_intr_handler(ring, 0);
-               s2io_chk_rx_buffers(sp, ring);
+               s2io_chk_rx_buffers(ring);
        }
 
+       S2IO_RING_DONE(ring);
        return IRQ_HANDLED;
 }
 
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,19))
+static irqreturn_t
+s2io_msix_fifo_handle(int irq, void *dev_id, struct pt_regs *regs)
+#else
 static irqreturn_t s2io_msix_fifo_handle(int irq, void *dev_id)
+#endif
 {
        int i;
        struct fifo_info *fifos = (struct fifo_info *)dev_id;
@@ -4364,34 +5934,44 @@ static irqreturn_t s2io_msix_fifo_handle(int irq, void *dev_id)
        struct config_param *config  = &sp->config;
        u64 reason;
 
-       if (unlikely(!is_s2io_card_up(sp)))
+       if (IRQ_HANDLED == S2IO_FIFO_IN_USE(sp))
+               return IRQ_HANDLED;
+
+       /*Increment the fifo interrupt counter*/
+       sp->tx_intr_cnt++;
+
+       /* In debug mode, return if a serious error has occured */
+       if (sp->serious_err && (0 == sp->exec_mode)) {
+               S2IO_FIFO_DONE(sp);
+               return IRQ_NONE;
+       }
+
+       if (unlikely(!is_s2io_card_up(sp))) {
+               S2IO_FIFO_DONE(sp);
                return IRQ_NONE;
+       }
 
        reason = readq(&bar0->general_int_status);
        if (unlikely(reason == S2IO_MINUS_ONE))
                /* Nothing much can be done. Get out */
                return IRQ_HANDLED;
 
-       if (reason & (GEN_INTR_TXPIC | GEN_INTR_TXTRAFFIC)) {
-               writeq(S2IO_MINUS_ONE, &bar0->general_int_mask);
+       writeq(S2IO_MINUS_ONE, &bar0->general_int_mask);
 
-               if (reason & GEN_INTR_TXPIC)
-                       s2io_txpic_intr_handle(sp);
+       if (reason & GEN_INTR_TXTRAFFIC)
+               writeq(S2IO_MINUS_ONE, &bar0->tx_traffic_int);
 
-               if (reason & GEN_INTR_TXTRAFFIC)
-                       writeq(S2IO_MINUS_ONE, &bar0->tx_traffic_int);
+       for (i = 0; i < config->tx_fifo_num; i++)
+               tx_intr_handler(&fifos[i]);
 
-               for (i = 0; i < config->tx_fifo_num; i++)
-                       tx_intr_handler(&fifos[i]);
+       writeq(sp->general_int_mask, &bar0->general_int_mask);
+       readl(&bar0->general_int_status);
 
-               writeq(sp->general_int_mask, &bar0->general_int_mask);
-               readl(&bar0->general_int_status);
-               return IRQ_HANDLED;
-       }
-       /* The interrupt was not raised by us */
-       return IRQ_NONE;
+       S2IO_FIFO_DONE(sp);
+       return IRQ_HANDLED;
 }
 
+#endif
 static void s2io_txpic_intr_handle(struct s2io_nic *sp)
 {
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
@@ -4401,7 +5981,7 @@ static void s2io_txpic_intr_handle(struct s2io_nic *sp)
        if (val64 & PIC_INT_GPIO) {
                val64 = readq(&bar0->gpio_int_reg);
                if ((val64 & GPIO_INT_REG_LINK_DOWN) &&
-                   (val64 & GPIO_INT_REG_LINK_UP)) {
+                       (val64 & GPIO_INT_REG_LINK_UP)) {
                        /*
                         * This is unstable state so clear both up/down
                         * interrupt and adapter to re-evaluate the link state.
@@ -4413,18 +5993,14 @@ static void s2io_txpic_intr_handle(struct s2io_nic *sp)
                        val64 &= ~(GPIO_INT_MASK_LINK_UP |
                                   GPIO_INT_MASK_LINK_DOWN);
                        writeq(val64, &bar0->gpio_int_mask);
-               }
-               else if (val64 & GPIO_INT_REG_LINK_UP) {
-                       val64 = readq(&bar0->adapter_status);
-                               /* Enable Adapter */
+               } else if (val64 & GPIO_INT_REG_LINK_UP) {
+                       /* Enable Adapter */
                        val64 = readq(&bar0->adapter_control);
                        val64 |= ADAPTER_CNTL_EN;
                        writeq(val64, &bar0->adapter_control);
                        val64 |= ADAPTER_LED_ON;
                        writeq(val64, &bar0->adapter_control);
-                       if (!sp->device_enabled_once)
-                               sp->device_enabled_once = 1;
-
+                       sp->device_enabled_once = TRUE;
                        s2io_link(sp, LINK_UP);
                        /*
                         * unmask link down interrupt and mask link-up
@@ -4435,25 +6011,23 @@ static void s2io_txpic_intr_handle(struct s2io_nic *sp)
                        val64 |= GPIO_INT_MASK_LINK_UP;
                        writeq(val64, &bar0->gpio_int_mask);
 
-               }else if (val64 & GPIO_INT_REG_LINK_DOWN) {
-                       val64 = readq(&bar0->adapter_status);
+               } else if (val64 & GPIO_INT_REG_LINK_DOWN) {
                        s2io_link(sp, LINK_DOWN);
-                       /* Link is down so unmaks link up interrupt */
+                       /* Link is down so unmask link up interrupt */
                        val64 = readq(&bar0->gpio_int_mask);
                        val64 &= ~GPIO_INT_MASK_LINK_UP;
                        val64 |= GPIO_INT_MASK_LINK_DOWN;
                        writeq(val64, &bar0->gpio_int_mask);
-
                        /* turn off LED */
                        val64 = readq(&bar0->adapter_control);
-                       val64 = val64 &(~ADAPTER_LED_ON);
+                       val64 = val64 & (~ADAPTER_LED_ON);
                        writeq(val64, &bar0->adapter_control);
                }
        }
-       val64 = readq(&bar0->gpio_int_mask);
+       readq(&bar0->gpio_int_mask);
 }
 
-/**
+ /**
  *  do_s2io_chk_alarm_bit - Check for alarm and incrment the counter
  *  @value: alarm bits
  *  @addr: address value
@@ -4463,50 +6037,47 @@ static void s2io_txpic_intr_handle(struct s2io_nic *sp)
  *  1 - if alarm bit set
  *  0 - if alarm bit is not set
  */
-static int do_s2io_chk_alarm_bit(u64 value, void __iomem * addr,
-                         unsigned long long *cnt)
+static int do_s2io_chk_alarm_bit(u64 value, void __iomem *addr,
+               unsigned long long *cnt)
 {
        u64 val64;
        val64 = readq(addr);
-       if ( val64 & value ) {
+       if (val64 & value) {
                writeq(val64, addr);
                (*cnt)++;
                return 1;
        }
        return 0;
-
 }
 
-/**
+ /**
  *  s2io_handle_errors - Xframe error indication handler
  *  @nic: device private variable
- *  Description: Handle alarms such as loss of link, single or
- *  double ECC errors, critical and serious errors.
- *  Return Value:
- *  NONE
+ *  Description: Handle alarms such as loss of link, single or double  ECC
+ *  errors, critical and serious errors.
+ *  Return Value: NONE
  */
-static void s2io_handle_errors(void * dev_id)
+static void s2io_handle_errors(void *dev_id)
 {
        struct net_device *dev = (struct net_device *) dev_id;
        struct s2io_nic *sp = dev->priv;
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
-       u64 temp64 = 0,val64=0;
+       u64 temp64 = 0, val64 = 0;
        int i = 0;
-
-       struct swStat *sw_stat = &sp->mac_control.stats_info->sw_stat;
-       struct xpakStat *stats = &sp->mac_control.stats_info->xpak_stat;
+       struct xpakStat *stats = sp->xpak_stat;
+       struct mac_info *mac_control;
+       mac_control = &sp->mac_control;
 
        if (!is_s2io_card_up(sp))
                return;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21))
        if (pci_channel_offline(sp->pdev))
                return;
-
-       memset(&sw_stat->ring_full_cnt, 0,
-               sizeof(sw_stat->ring_full_cnt));
+#endif
 
        /* Handling the XPAK counters update */
-       if(stats->xpak_timer_count < 72000) {
+       if (stats->xpak_timer_count < 72000) {
                /* waiting for an hour */
                stats->xpak_timer_count++;
        } else {
@@ -4525,97 +6096,114 @@ static void s2io_handle_errors(void * dev_id)
 
        /* In case of a serious error, the device will be Reset. */
        if (do_s2io_chk_alarm_bit(SERR_SOURCE_ANY, &bar0->serr_source,
-                               &sw_stat->serious_err_cnt))
+                               &sp->mac_stat_info->serious_err_cnt))
                goto reset;
 
        /* Check for data parity error */
        if (do_s2io_chk_alarm_bit(GPIO_INT_REG_DP_ERR_INT, &bar0->gpio_int_reg,
-                               &sw_stat->parity_err_cnt))
+                               &sp->mac_stat_info->parity_err_cnt))
+               goto reset;
+
+       val64 = readq(&bar0->gpio_int_reg);
+       if (val64 & GPIO_INT_REG_DP_ERR_INT) {
+               sp->mac_stat_info->parity_err_cnt++;
                goto reset;
+       }
 
        /* Check for ring full counter */
        if (sp->device_type == XFRAME_II_DEVICE) {
-               val64 = readq(&bar0->ring_bump_counter1);
-               for (i=0; i<4; i++) {
-                       temp64 = ( val64 & vBIT(0xFFFF,(i*16),16));
-                       temp64 >>= 64 - ((i+1)*16);
-                       sw_stat->ring_full_cnt[i] += temp64;
-               }
-
-               val64 = readq(&bar0->ring_bump_counter2);
-               for (i=0; i<4; i++) {
-                       temp64 = ( val64 & vBIT(0xFFFF,(i*16),16));
+               for (i = 0; i < sp->config.rx_ring_num; i++) {
+                       if (i < 4)
+                               val64 = readq(&bar0->ring_bump_counter1);
+                       else
+                               val64 = readq(&bar0->ring_bump_counter2);
+                       temp64 = (val64 & vBIT(0xFFFF, (i*16), 16));
                        temp64 >>= 64 - ((i+1)*16);
-                        sw_stat->ring_full_cnt[i+4] += temp64;
+                       mac_control->rings[i].rx_ring_stat->ring_full_cnt +=
+                               temp64;
                }
        }
 
+
        val64 = readq(&bar0->txdma_int_status);
        /*check for pfc_err*/
        if (val64 & TXDMA_PFC_INT) {
-               if (do_s2io_chk_alarm_bit(PFC_ECC_DB_ERR | PFC_SM_ERR_ALARM|
-                               PFC_MISC_0_ERR | PFC_MISC_1_ERR|
+               if (do_s2io_chk_alarm_bit(PFC_ECC_DB_ERR | PFC_SM_ERR_ALARM |
+                               PFC_MISC_0_ERR | PFC_MISC_1_ERR |
                                PFC_PCIX_ERR, &bar0->pfc_err_reg,
-                               &sw_stat->pfc_err_cnt))
+                               &sp->mac_stat_info->pfc_err_cnt))
                        goto reset;
                do_s2io_chk_alarm_bit(PFC_ECC_SG_ERR, &bar0->pfc_err_reg,
-                               &sw_stat->pfc_err_cnt);
+                               &sp->mac_stat_info->pfc_err_cnt);
        }
 
        /*check for tda_err*/
        if (val64 & TXDMA_TDA_INT) {
-               if(do_s2io_chk_alarm_bit(TDA_Fn_ECC_DB_ERR | TDA_SM0_ERR_ALARM |
+               if (do_s2io_chk_alarm_bit(TDA_Fn_ECC_DB_ERR |
+                               TDA_SM0_ERR_ALARM |
                                TDA_SM1_ERR_ALARM, &bar0->tda_err_reg,
-                               &sw_stat->tda_err_cnt))
+                               &sp->mac_stat_info->tda_err_cnt))
                        goto reset;
                do_s2io_chk_alarm_bit(TDA_Fn_ECC_SG_ERR | TDA_PCIX_ERR,
-                               &bar0->tda_err_reg, &sw_stat->tda_err_cnt);
+                               &bar0->tda_err_reg,
+                               &sp->mac_stat_info->tda_err_cnt);
        }
        /*check for pcc_err*/
        if (val64 & TXDMA_PCC_INT) {
-               if (do_s2io_chk_alarm_bit(PCC_SM_ERR_ALARM | PCC_WR_ERR_ALARM
-                               | PCC_N_SERR | PCC_6_COF_OV_ERR
-                               | PCC_7_COF_OV_ERR | PCC_6_LSO_OV_ERR
-                               | PCC_7_LSO_OV_ERR | PCC_FB_ECC_DB_ERR
-                               | PCC_TXB_ECC_DB_ERR, &bar0->pcc_err_reg,
-                               &sw_stat->pcc_err_cnt))
+               val64 = readq(&bar0->pcc_err_reg);
+               temp64 = PCC_TXB_ECC_DB_ERR
+                       | PCC_SM_ERR_ALARM | PCC_WR_ERR_ALARM
+                       | PCC_N_SERR | PCC_6_COF_OV_ERR
+                       | PCC_7_COF_OV_ERR | PCC_6_LSO_OV_ERR
+                       | PCC_7_LSO_OV_ERR | PCC_FB_ECC_DB_ERR
+                       | PCC_TXB_ECC_DB_ERR;
+               if (val64 & temp64) {
+                       writeq(val64, &bar0->pcc_err_reg);
+                       sp->mac_stat_info->pcc_err_cnt++;
+                       if (val64 & PCC_N_SERR)
+                               sp->serious_err = 1;
                        goto reset;
+               }
                do_s2io_chk_alarm_bit(PCC_FB_ECC_SG_ERR | PCC_TXB_ECC_SG_ERR,
-                               &bar0->pcc_err_reg, &sw_stat->pcc_err_cnt);
+                               &bar0->pcc_err_reg,
+                               &sp->mac_stat_info->pcc_err_cnt);
        }
 
        /*check for tti_err*/
        if (val64 & TXDMA_TTI_INT) {
                if (do_s2io_chk_alarm_bit(TTI_SM_ERR_ALARM, &bar0->tti_err_reg,
-                               &sw_stat->tti_err_cnt))
+                                       &sp->mac_stat_info->tti_err_cnt))
                        goto reset;
-               do_s2io_chk_alarm_bit(TTI_ECC_SG_ERR | TTI_ECC_DB_ERR,
-                               &bar0->tti_err_reg, &sw_stat->tti_err_cnt);
+               do_s2io_chk_alarm_bit(LSO6_SEND_OFLOW | LSO7_SEND_OFLOW,
+                               &bar0->lso_err_reg,
+                               &sp->mac_stat_info->tti_err_cnt);
        }
 
        /*check for lso_err*/
        if (val64 & TXDMA_LSO_INT) {
                if (do_s2io_chk_alarm_bit(LSO6_ABORT | LSO7_ABORT
                                | LSO6_SM_ERR_ALARM | LSO7_SM_ERR_ALARM,
-                               &bar0->lso_err_reg, &sw_stat->lso_err_cnt))
+                               &bar0->lso_err_reg,
+                               &sp->mac_stat_info->lso_err_cnt))
                        goto reset;
                do_s2io_chk_alarm_bit(LSO6_SEND_OFLOW | LSO7_SEND_OFLOW,
-                               &bar0->lso_err_reg, &sw_stat->lso_err_cnt);
+                               &bar0->lso_err_reg,
+                               &sp->mac_stat_info->lso_err_cnt);
        }
 
        /*check for tpa_err*/
        if (val64 & TXDMA_TPA_INT) {
                if (do_s2io_chk_alarm_bit(TPA_SM_ERR_ALARM, &bar0->tpa_err_reg,
-                       &sw_stat->tpa_err_cnt))
+                               &sp->mac_stat_info->tpa_err_cnt))
                        goto reset;
                do_s2io_chk_alarm_bit(TPA_TX_FRM_DROP, &bar0->tpa_err_reg,
-                       &sw_stat->tpa_err_cnt);
+                               &sp->mac_stat_info->tpa_err_cnt);
        }
 
        /*check for sm_err*/
        if (val64 & TXDMA_SM_INT) {
                if (do_s2io_chk_alarm_bit(SM_SM_ERR_ALARM, &bar0->sm_err_reg,
-                       &sw_stat->sm_err_cnt))
+                       &sp->mac_stat_info->sm_err_cnt))
                        goto reset;
        }
 
@@ -4623,119 +6211,135 @@ static void s2io_handle_errors(void * dev_id)
        if (val64 & MAC_INT_STATUS_TMAC_INT) {
                if (do_s2io_chk_alarm_bit(TMAC_TX_BUF_OVRN | TMAC_TX_SM_ERR,
                                &bar0->mac_tmac_err_reg,
-                               &sw_stat->mac_tmac_err_cnt))
+                               &sp->mac_stat_info->mac_tmac_err_cnt))
                        goto reset;
                do_s2io_chk_alarm_bit(TMAC_ECC_SG_ERR | TMAC_ECC_DB_ERR
                                | TMAC_DESC_ECC_SG_ERR | TMAC_DESC_ECC_DB_ERR,
                                &bar0->mac_tmac_err_reg,
-                               &sw_stat->mac_tmac_err_cnt);
+                               &sp->mac_stat_info->mac_tmac_err_cnt);
+
        }
 
        val64 = readq(&bar0->xgxs_int_status);
        if (val64 & XGXS_INT_STATUS_TXGXS) {
                if (do_s2io_chk_alarm_bit(TXGXS_ESTORE_UFLOW | TXGXS_TX_SM_ERR,
                                &bar0->xgxs_txgxs_err_reg,
-                               &sw_stat->xgxs_txgxs_err_cnt))
+                               &sp->mac_stat_info->xgxs_txgxs_err_cnt))
                        goto reset;
                do_s2io_chk_alarm_bit(TXGXS_ECC_SG_ERR | TXGXS_ECC_DB_ERR,
                                &bar0->xgxs_txgxs_err_reg,
-                               &sw_stat->xgxs_txgxs_err_cnt);
+                               &sp->mac_stat_info->xgxs_txgxs_err_cnt);
        }
 
        val64 = readq(&bar0->rxdma_int_status);
        if (val64 & RXDMA_INT_RC_INT_M) {
-               if (do_s2io_chk_alarm_bit(RC_PRCn_ECC_DB_ERR | RC_FTC_ECC_DB_ERR
-                               | RC_PRCn_SM_ERR_ALARM |RC_FTC_SM_ERR_ALARM,
-                               &bar0->rc_err_reg, &sw_stat->rc_err_cnt))
+               if (do_s2io_chk_alarm_bit(RC_PRCn_ECC_DB_ERR |
+                               RC_FTC_ECC_DB_ERR | RC_PRCn_SM_ERR_ALARM |
+                               RC_FTC_SM_ERR_ALARM, &bar0->rc_err_reg,
+                               &sp->mac_stat_info->rc_err_cnt))
                        goto reset;
                do_s2io_chk_alarm_bit(RC_PRCn_ECC_SG_ERR | RC_FTC_ECC_SG_ERR
                                | RC_RDA_FAIL_WR_Rn, &bar0->rc_err_reg,
-                               &sw_stat->rc_err_cnt);
+                               &sp->mac_stat_info->rc_err_cnt);
                if (do_s2io_chk_alarm_bit(PRC_PCI_AB_RD_Rn | PRC_PCI_AB_WR_Rn
                                | PRC_PCI_AB_F_WR_Rn, &bar0->prc_pcix_err_reg,
-                               &sw_stat->prc_pcix_err_cnt))
+                               &sp->mac_stat_info->prc_pcix_err_cnt))
                        goto reset;
+
                do_s2io_chk_alarm_bit(PRC_PCI_DP_RD_Rn | PRC_PCI_DP_WR_Rn
                                | PRC_PCI_DP_F_WR_Rn, &bar0->prc_pcix_err_reg,
-                               &sw_stat->prc_pcix_err_cnt);
+                               &sp->mac_stat_info->prc_pcix_err_cnt);
        }
 
        if (val64 & RXDMA_INT_RPA_INT_M) {
                if (do_s2io_chk_alarm_bit(RPA_SM_ERR_ALARM | RPA_CREDIT_ERR,
-                               &bar0->rpa_err_reg, &sw_stat->rpa_err_cnt))
+                               &bar0->rpa_err_reg,
+                               &sp->mac_stat_info->rpa_err_cnt))
                        goto reset;
                do_s2io_chk_alarm_bit(RPA_ECC_SG_ERR | RPA_ECC_DB_ERR,
-                               &bar0->rpa_err_reg, &sw_stat->rpa_err_cnt);
+                               &bar0->rpa_err_reg,
+                               &sp->mac_stat_info->rpa_err_cnt);
        }
 
        if (val64 & RXDMA_INT_RDA_INT_M) {
                if (do_s2io_chk_alarm_bit(RDA_RXDn_ECC_DB_ERR
                                | RDA_FRM_ECC_DB_N_AERR | RDA_SM1_ERR_ALARM
                                | RDA_SM0_ERR_ALARM | RDA_RXD_ECC_DB_SERR,
-                               &bar0->rda_err_reg, &sw_stat->rda_err_cnt))
+                               &bar0->rda_err_reg,
+                               &sp->mac_stat_info->rda_err_cnt))
                        goto reset;
                do_s2io_chk_alarm_bit(RDA_RXDn_ECC_SG_ERR | RDA_FRM_ECC_SG_ERR
                                | RDA_MISC_ERR | RDA_PCIX_ERR,
-                               &bar0->rda_err_reg, &sw_stat->rda_err_cnt);
+                               &bar0->rda_err_reg,
+                               &sp->mac_stat_info->rda_err_cnt);
        }
 
        if (val64 & RXDMA_INT_RTI_INT_M) {
                if (do_s2io_chk_alarm_bit(RTI_SM_ERR_ALARM, &bar0->rti_err_reg,
-                               &sw_stat->rti_err_cnt))
+                               &sp->mac_stat_info->rti_err_cnt))
                        goto reset;
                do_s2io_chk_alarm_bit(RTI_ECC_SG_ERR | RTI_ECC_DB_ERR,
-                               &bar0->rti_err_reg, &sw_stat->rti_err_cnt);
+                               &bar0->rti_err_reg,
+                               &sp->mac_stat_info->rti_err_cnt);
        }
 
        val64 = readq(&bar0->mac_int_status);
        if (val64 & MAC_INT_STATUS_RMAC_INT) {
                if (do_s2io_chk_alarm_bit(RMAC_RX_BUFF_OVRN | RMAC_RX_SM_ERR,
                                &bar0->mac_rmac_err_reg,
-                               &sw_stat->mac_rmac_err_cnt))
+                               &sp->mac_stat_info->mac_rmac_err_cnt))
                        goto reset;
                do_s2io_chk_alarm_bit(RMAC_UNUSED_INT|RMAC_SINGLE_ECC_ERR|
                                RMAC_DOUBLE_ECC_ERR, &bar0->mac_rmac_err_reg,
-                               &sw_stat->mac_rmac_err_cnt);
+                               &sp->mac_stat_info->mac_rmac_err_cnt);
        }
 
        val64 = readq(&bar0->xgxs_int_status);
        if (val64 & XGXS_INT_STATUS_RXGXS) {
                if (do_s2io_chk_alarm_bit(RXGXS_ESTORE_OFLOW | RXGXS_RX_SM_ERR,
                                &bar0->xgxs_rxgxs_err_reg,
-                               &sw_stat->xgxs_rxgxs_err_cnt))
+                               &sp->mac_stat_info->xgxs_rxgxs_err_cnt))
                        goto reset;
        }
 
        val64 = readq(&bar0->mc_int_status);
-       if(val64 & MC_INT_STATUS_MC_INT) {
+       if (val64 & MC_INT_STATUS_MC_INT) {
                if (do_s2io_chk_alarm_bit(MC_ERR_REG_SM_ERR, &bar0->mc_err_reg,
-                               &sw_stat->mc_err_cnt))
+                               &sp->mac_stat_info->mc_err_cnt))
                        goto reset;
 
                /* Handling Ecc errors */
-               if (val64 & (MC_ERR_REG_ECC_ALL_SNG | MC_ERR_REG_ECC_ALL_DBL)) {
+               if (val64 & (MC_ERR_REG_ECC_ALL_SNG |
+                       MC_ERR_REG_ECC_ALL_DBL)) {
                        writeq(val64, &bar0->mc_err_reg);
                        if (val64 & MC_ERR_REG_ECC_ALL_DBL) {
-                               sw_stat->double_ecc_errs++;
+                               sp->mac_stat_info->double_ecc_errs++;
                                if (sp->device_type != XFRAME_II_DEVICE) {
-                                       /*
-                                        * Reset XframeI only if critical error
-                                        */
+                                       /* Reset XframeI only if critical
+                                       * error occured
+                                       */
                                        if (val64 &
                                                (MC_ERR_REG_MIRI_ECC_DB_ERR_0 |
                                                MC_ERR_REG_MIRI_ECC_DB_ERR_1))
-                                                               goto reset;
+                                               goto reset;
                                        }
                        } else
-                               sw_stat->single_ecc_errs++;
+                               sp->mac_stat_info->single_ecc_errs++;
+#ifdef RX_ERR_DBG
+                       sp->ecc_flag = 1;
+#endif
                }
        }
        return;
 
 reset:
        s2io_stop_all_tx_queue(sp);
-       schedule_work(&sp->rst_timer_task);
-       sw_stat->soft_reset_cnt++;
+
+       if (sp->exec_mode) {
+               schedule_work(&sp->rst_timer_task);
+               sp->mac_stat_info->soft_reset_cnt++;
+       } else
+               sp->serious_err = 1;
        return;
 }
 
@@ -4743,6 +6347,7 @@ reset:
  *  s2io_isr - ISR handler of the device .
  *  @irq: the irq of the device.
  *  @dev_id: a void pointer to the dev structure of the NIC.
+ *  @pt_regs: pointer to the registers pushed on the stack.
  *  Description:  This function is the ISR handler of the device. It
  *  identifies the reason for the interrupt and calls the relevant
  *  service routines. As a contongency measure, this ISR allocates the
@@ -4752,21 +6357,31 @@ reset:
  *   IRQ_HANDLED: will be returned if IRQ was handled by this routine
  *   IRQ_NONE: will be returned if interrupt is not from our device
  */
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19))
+static irqreturn_t s2io_isr(int irq, void *dev_id, struct pt_regs *regs)
+#else
 static irqreturn_t s2io_isr(int irq, void *dev_id)
+#endif
 {
        struct net_device *dev = (struct net_device *) dev_id;
        struct s2io_nic *sp = dev->priv;
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
        int i;
-       u64 reason = 0;
+       u64 reason;
        struct mac_info *mac_control;
        struct config_param *config;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21))
        /* Pretend we handled any irq's from a disconnected card */
        if (pci_channel_offline(sp->pdev))
                return IRQ_NONE;
+#endif
 
-       if (!is_s2io_card_up(sp))
+       /* In debug mode, return if a serious error has occured */
+       if (sp->serious_err && (0 == sp->exec_mode))
+               return IRQ_NONE;
+
+       if (unlikely(!is_s2io_card_up(sp)))
                return IRQ_NONE;
 
        mac_control = &sp->mac_control;
@@ -4778,22 +6393,29 @@ static irqreturn_t s2io_isr(int irq, void *dev_id)
         * 1. Rx of packet.
         * 2. Tx complete.
         * 3. Link down.
+        * 4. Error in any functional blocks of the NIC.
         */
        reason = readq(&bar0->general_int_status);
 
-       if (unlikely(reason == S2IO_MINUS_ONE) ) {
+       if (unlikely(reason == S2IO_MINUS_ONE)) {
                /* Nothing much can be done. Get out */
                return IRQ_HANDLED;
        }
 
        if (reason & (GEN_INTR_RXTRAFFIC |
-               GEN_INTR_TXTRAFFIC | GEN_INTR_TXPIC))
-       {
+               GEN_INTR_TXTRAFFIC | GEN_INTR_TXPIC)) {
                writeq(S2IO_MINUS_ONE, &bar0->general_int_mask);
 
-               if (config->napi) {
+               if (sp->config.napi) {
                        if (reason & GEN_INTR_RXTRAFFIC) {
-                               netif_rx_schedule(dev, &sp->napi);
+                               sp->rx_intr_cnt++;
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
+                               netif_rx_schedule(dev,
+                                       &mac_control->rings[0].napi);
+#else
+                               netif_rx_schedule(dev);
+#endif
                                writeq(S2IO_MINUS_ONE, &bar0->rx_traffic_mask);
                                writeq(S2IO_MINUS_ONE, &bar0->rx_traffic_int);
                                readl(&bar0->rx_traffic_int);
@@ -4802,10 +6424,12 @@ static irqreturn_t s2io_isr(int irq, void *dev_id)
                        /*
                         * rx_traffic_int reg is an R1 register, writing all 1's
                         * will ensure that the actual interrupt causing bit
-                        * get's cleared and hence a read can be avoided.
+                        * gets cleared and hence a read can be avoided.
                         */
-                       if (reason & GEN_INTR_RXTRAFFIC)
+                       if (reason & GEN_INTR_RXTRAFFIC) {
+                               sp->rx_intr_cnt++;
                                writeq(S2IO_MINUS_ONE, &bar0->rx_traffic_int);
+                       }
 
                        for (i = 0; i < config->rx_ring_num; i++)
                                rx_intr_handler(&mac_control->rings[i], 0);
@@ -4816,8 +6440,10 @@ static irqreturn_t s2io_isr(int irq, void *dev_id)
                 * will ensure that the actual interrupt causing bit get's
                 * cleared and hence a read can be avoided.
                 */
-               if (reason & GEN_INTR_TXTRAFFIC)
+               if (reason & GEN_INTR_TXTRAFFIC) {
+                       sp->tx_intr_cnt++;
                        writeq(S2IO_MINUS_ONE, &bar0->tx_traffic_int);
+               }
 
                for (i = 0; i < config->tx_fifo_num; i++)
                        tx_intr_handler(&mac_control->fifos[i]);
@@ -4828,17 +6454,14 @@ static irqreturn_t s2io_isr(int irq, void *dev_id)
                /*
                 * Reallocate the buffers from the interrupt handler itself.
                 */
-               if (!config->napi) {
+               if (!sp->config.napi)
                        for (i = 0; i < config->rx_ring_num; i++)
-                               s2io_chk_rx_buffers(sp, &mac_control->rings[i]);
-               }
+                               s2io_chk_rx_buffers(&mac_control->rings[i]);
+
                writeq(sp->general_int_mask, &bar0->general_int_mask);
                readl(&bar0->general_int_status);
-
                return IRQ_HANDLED;
-
-       }
-       else if (!reason) {
+       } else if (unlikely(!reason)) {
                /* The interrupt was not raised by us */
                return IRQ_NONE;
        }
@@ -4855,6 +6478,11 @@ static void s2io_updt_stats(struct s2io_nic *sp)
        u64 val64;
        int cnt = 0;
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21))
+       if (pci_channel_offline(sp->pdev))
+               return;
+#endif
+
        if (is_s2io_card_up(sp)) {
                /* Apprx 30us on a 133 MHz bus */
                val64 = SET_UPDT_CLICKS(10) |
@@ -4863,7 +6491,7 @@ static void s2io_updt_stats(struct s2io_nic *sp)
                do {
                        udelay(100);
                        val64 = readq(&bar0->stat_cfg);
-                       if (!(val64 & s2BIT(0)))
+                       if (!(val64 & S2BIT(0)))
                                break;
                        cnt++;
                        if (cnt == 5)
@@ -4886,52 +6514,38 @@ static struct net_device_stats *s2io_get_stats(struct net_device *dev)
 {
        struct s2io_nic *sp = dev->priv;
        struct mac_info *mac_control;
+       struct stat_block *stats_info = sp->mac_control.stats_info;
        struct config_param *config;
        int i;
 
-
        mac_control = &sp->mac_control;
        config = &sp->config;
 
        /* Configure Stats for immediate updt */
        s2io_updt_stats(sp);
 
-       /* Using sp->stats as a staging area, because reset (due to mtu
-          change, for example) will clear some hardware counters */
-       dev->stats.tx_packets +=
-               le32_to_cpu(mac_control->stats_info->tmac_frms) - 
-               sp->stats.tx_packets;
        sp->stats.tx_packets =
-               le32_to_cpu(mac_control->stats_info->tmac_frms);
-       dev->stats.tx_errors +=
-               le32_to_cpu(mac_control->stats_info->tmac_any_err_frms) -
-               sp->stats.tx_errors;
+               (u64)le32_to_cpu(stats_info->tmac_frms_oflow) << 32  |
+               le32_to_cpu(stats_info->tmac_frms);
        sp->stats.tx_errors =
-               le32_to_cpu(mac_control->stats_info->tmac_any_err_frms);
-       dev->stats.rx_errors +=
-               le64_to_cpu(mac_control->stats_info->rmac_drop_frms) -
-               sp->stats.rx_errors;
+               (u64)le32_to_cpu(stats_info->tmac_any_err_frms_oflow) << 32  |
+               le32_to_cpu(stats_info->tmac_any_err_frms);
        sp->stats.rx_errors =
-               le64_to_cpu(mac_control->stats_info->rmac_drop_frms);
-       dev->stats.multicast =
-               le32_to_cpu(mac_control->stats_info->rmac_vld_mcst_frms) - 
-               sp->stats.multicast;
+               le64_to_cpu(stats_info->rmac_drop_frms);
        sp->stats.multicast =
-               le32_to_cpu(mac_control->stats_info->rmac_vld_mcst_frms);
-       dev->stats.rx_length_errors =
-               le64_to_cpu(mac_control->stats_info->rmac_long_frms) - 
-               sp->stats.rx_length_errors;
+               (u64)le32_to_cpu(stats_info->rmac_vld_mcst_frms_oflow) << 32  |
+               le32_to_cpu(stats_info->rmac_vld_mcst_frms);
        sp->stats.rx_length_errors =
-               le64_to_cpu(mac_control->stats_info->rmac_long_frms);
+               le64_to_cpu(stats_info->rmac_long_frms);
 
        /* collect per-ring rx_packets and rx_bytes */
-       dev->stats.rx_packets = dev->stats.rx_bytes = 0;
+       sp->stats.rx_packets = sp->stats.rx_bytes = 0;
        for (i = 0; i < config->rx_ring_num; i++) {
-               dev->stats.rx_packets += mac_control->rings[i].rx_packets;
-               dev->stats.rx_bytes += mac_control->rings[i].rx_bytes;
+               sp->stats.rx_packets += mac_control->rings[i].rx_packets;
+               sp->stats.rx_bytes += mac_control->rings[i].rx_bytes;
        }
 
-       return (&dev->stats);
+       return (&sp->stats);
 }
 
 /**
@@ -4971,25 +6585,25 @@ static void s2io_set_multicast(struct net_device *dev)
                writeq(val64, &bar0->rmac_addr_cmd_mem);
                /* Wait till command completes */
                wait_for_cmd_complete(&bar0->rmac_addr_cmd_mem,
-                                       RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING,
-                                       S2IO_BIT_RESET);
+                               RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING,
+                               S2IO_BIT_RESET);
 
                sp->m_cast_flg = 1;
                sp->all_multi_pos = config->max_mc_addr - 1;
        } else if ((dev->flags & IFF_ALLMULTI) && (sp->m_cast_flg)) {
                /*  Disable all Multicast addresses */
                writeq(RMAC_ADDR_DATA0_MEM_ADDR(dis_addr),
-                      &bar0->rmac_addr_data0_mem);
+                       &bar0->rmac_addr_data0_mem);
                writeq(RMAC_ADDR_DATA1_MEM_MASK(0x0),
-                      &bar0->rmac_addr_data1_mem);
+                       &bar0->rmac_addr_data1_mem);
                val64 = RMAC_ADDR_CMD_MEM_WE |
-                   RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD |
-                   RMAC_ADDR_CMD_MEM_OFFSET(sp->all_multi_pos);
+                       RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD |
+                       RMAC_ADDR_CMD_MEM_OFFSET(sp->all_multi_pos);
                writeq(val64, &bar0->rmac_addr_cmd_mem);
                /* Wait till command completes */
                wait_for_cmd_complete(&bar0->rmac_addr_cmd_mem,
-                                       RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING,
-                                       S2IO_BIT_RESET);
+                               RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING,
+                               S2IO_BIT_RESET);
 
                sp->m_cast_flg = 0;
                sp->all_multi_pos = 0;
@@ -5006,20 +6620,13 @@ static void s2io_set_multicast(struct net_device *dev)
                writeq(RMAC_CFG_KEY(0x4C0D), &bar0->rmac_cfg_key);
                writel((u32) (val64 >> 32), (add + 4));
 
-               if (vlan_tag_strip != 1) {
-                       val64 = readq(&bar0->rx_pa_cfg);
-                       val64 &= ~RX_PA_CFG_STRIP_VLAN_TAG;
-                       writeq(val64, &bar0->rx_pa_cfg);
-                       vlan_strip_flag = 0;
-               }
-
                val64 = readq(&bar0->mac_cfg);
                sp->promisc_flg = 1;
                DBG_PRINT(INFO_DBG, "%s: entered promiscuous mode\n",
-                         dev->name);
+                       dev->name);
        } else if (!(dev->flags & IFF_PROMISC) && (sp->promisc_flg)) {
                /*  Remove the NIC from promiscuous mode */
-               add = &bar0->mac_cfg;
+               add = (void *) &bar0->mac_cfg;
                val64 = readq(&bar0->mac_cfg);
                val64 &= ~MAC_CFG_RMAC_PROM_ENABLE;
 
@@ -5028,25 +6635,18 @@ static void s2io_set_multicast(struct net_device *dev)
                writeq(RMAC_CFG_KEY(0x4C0D), &bar0->rmac_cfg_key);
                writel((u32) (val64 >> 32), (add + 4));
 
-               if (vlan_tag_strip != 0) {
-                       val64 = readq(&bar0->rx_pa_cfg);
-                       val64 |= RX_PA_CFG_STRIP_VLAN_TAG;
-                       writeq(val64, &bar0->rx_pa_cfg);
-                       vlan_strip_flag = 1;
-               }
-
                val64 = readq(&bar0->mac_cfg);
                sp->promisc_flg = 0;
                DBG_PRINT(INFO_DBG, "%s: left promiscuous mode\n",
-                         dev->name);
+                       dev->name);
        }
 
        /*  Update individual M_CAST address list */
        if ((!sp->m_cast_flg) && dev->mc_count) {
                if (dev->mc_count >
-                   (config->max_mc_addr - config->max_mac_addr)) {
+                       (config->max_mc_addr - config->max_mac_addr)) {
                        DBG_PRINT(ERR_DBG, "%s: No more Rx filters ",
-                                 dev->name);
+                               dev->name);
                        DBG_PRINT(ERR_DBG, "can be added, please enable ");
                        DBG_PRINT(ERR_DBG, "ALL_MULTI instead\n");
                        return;
@@ -5058,21 +6658,20 @@ static void s2io_set_multicast(struct net_device *dev)
                /* Clear out the previous list of Mc in the H/W. */
                for (i = 0; i < prev_cnt; i++) {
                        writeq(RMAC_ADDR_DATA0_MEM_ADDR(dis_addr),
-                              &bar0->rmac_addr_data0_mem);
+                               &bar0->rmac_addr_data0_mem);
                        writeq(RMAC_ADDR_DATA1_MEM_MASK(0ULL),
                                &bar0->rmac_addr_data1_mem);
                        val64 = RMAC_ADDR_CMD_MEM_WE |
-                           RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD |
-                           RMAC_ADDR_CMD_MEM_OFFSET
-                           (config->mc_start_offset + i);
+                               RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD |
+                               RMAC_ADDR_CMD_MEM_OFFSET
+                               (config->mc_start_offset + i);
                        writeq(val64, &bar0->rmac_addr_cmd_mem);
 
                        /* Wait for command completes */
                        if (wait_for_cmd_complete(&bar0->rmac_addr_cmd_mem,
-                                       RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING,
-                                       S2IO_BIT_RESET)) {
-                               DBG_PRINT(ERR_DBG, "%s: Adding ",
-                                         dev->name);
+                               RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING,
+                               S2IO_BIT_RESET)) {
+                               DBG_PRINT(ERR_DBG, "%s: Adding ", dev->name);
                                DBG_PRINT(ERR_DBG, "Multicasts failed\n");
                                return;
                        }
@@ -5080,9 +6679,7 @@ static void s2io_set_multicast(struct net_device *dev)
 
                /* Create the new Rx filter list and update the same in H/W. */
                for (i = 0, mclist = dev->mc_list; i < dev->mc_count;
-                    i++, mclist = mclist->next) {
-                       memcpy(sp->usr_addrs[i].addr, mclist->dmi_addr,
-                              ETH_ALEN);
+                       i++, mclist = mclist->next) {
                        mac_addr = 0;
                        for (j = 0; j < ETH_ALEN; j++) {
                                mac_addr |= mclist->dmi_addr[j];
@@ -5090,21 +6687,20 @@ static void s2io_set_multicast(struct net_device *dev)
                        }
                        mac_addr >>= 8;
                        writeq(RMAC_ADDR_DATA0_MEM_ADDR(mac_addr),
-                              &bar0->rmac_addr_data0_mem);
+                               &bar0->rmac_addr_data0_mem);
                        writeq(RMAC_ADDR_DATA1_MEM_MASK(0ULL),
                                &bar0->rmac_addr_data1_mem);
                        val64 = RMAC_ADDR_CMD_MEM_WE |
-                           RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD |
-                           RMAC_ADDR_CMD_MEM_OFFSET
-                           (i + config->mc_start_offset);
+                               RMAC_ADDR_CMD_MEM_STROBE_NEW_CMD |
+                               RMAC_ADDR_CMD_MEM_OFFSET
+                               (i + config->mc_start_offset);
                        writeq(val64, &bar0->rmac_addr_cmd_mem);
 
                        /* Wait for command completes */
                        if (wait_for_cmd_complete(&bar0->rmac_addr_cmd_mem,
-                                       RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING,
-                                       S2IO_BIT_RESET)) {
-                               DBG_PRINT(ERR_DBG, "%s: Adding ",
-                                         dev->name);
+                               RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING,
+                               S2IO_BIT_RESET)) {
+                               DBG_PRINT(ERR_DBG, "%s: Adding ", dev->name);
                                DBG_PRINT(ERR_DBG, "Multicasts failed\n");
                                return;
                        }
@@ -5112,9 +6708,9 @@ static void s2io_set_multicast(struct net_device *dev)
        }
 }
 
-/* read from CAM unicast & multicast addresses and store it in
- * def_mac_addr structure
- */
+/* read from CAM unicast & multicast addresses and store it in def_mac_addr
+* structure
+*/
 void do_s2io_store_unicast_mc(struct s2io_nic *sp)
 {
        int offset;
@@ -5131,7 +6727,9 @@ void do_s2io_store_unicast_mc(struct s2io_nic *sp)
        }
 }
 
-/* restore unicast & multicast MAC to CAM from def_mac_addr structure */
+/* restore unicast MAC addresses(0-15 entries)& multicast(16-31)
+ * to CAM from def_mac_addr structure
+ **/
 static void do_s2io_restore_unicast_mc(struct s2io_nic *sp)
 {
        int offset;
@@ -5147,7 +6745,9 @@ static void do_s2io_restore_unicast_mc(struct s2io_nic *sp)
                do_s2io_add_mc(sp, sp->def_mac_addr[offset].mac_addr);
 }
 
-/* add a multicast MAC address to CAM */
+/* add a multicast MAC address to CAM. CAM entries 16-31 are used to
+ * store multicast MAC entries
+ **/
 static int do_s2io_add_mc(struct s2io_nic *sp, u8 *addr)
 {
        int i;
@@ -5171,10 +6771,10 @@ static int do_s2io_add_mc(struct s2io_nic *sp, u8 *addr)
                if (tmp64 == mac_addr)
                        return SUCCESS;
        }
+
        if (i == config->max_mc_addr) {
-               DBG_PRINT(ERR_DBG,
-                       "CAM full no space left for multicast MAC\n");
-               return FAILURE;
+           DBG_PRINT(ERR_DBG, "CAM full no space left for multicast MAC\n");
+           return FAILURE;
        }
        /* Update the internal structure with this new mac address */
        do_s2io_copy_mac_addr(sp, i, mac_addr);
@@ -5205,19 +6805,20 @@ static int do_s2io_add_mac(struct s2io_nic *sp, u64 addr, int off)
        }
        return SUCCESS;
 }
+
 /* deletes a specified unicast/multicast mac entry from CAM */
 static int do_s2io_delete_unicast_mc(struct s2io_nic *sp, u64 addr)
 {
-       int offset;
+       int off;
        u64 dis_addr = S2IO_DISABLE_MAC_ENTRY, tmp64;
        struct config_param *config = &sp->config;
 
-       for (offset = 1;
-               offset < config->max_mc_addr; offset++) {
-               tmp64 = do_s2io_read_unicast_mc(sp, offset);
+       for (off = 1;
+               off < config->max_mc_addr; off++) {
+               tmp64 = do_s2io_read_unicast_mc(sp, off);
                if (tmp64 == addr) {
                        /* disable the entry by writing  0xffffffffffffULL */
-                       if (do_s2io_add_mac(sp, dis_addr, offset) ==  FAILURE)
+                       if (do_s2io_add_mac(sp, dis_addr, off) ==  FAILURE)
                                return FAILURE;
                        /* store the new mac list from CAM */
                        do_s2io_store_unicast_mc(sp);
@@ -5268,6 +6869,7 @@ static int s2io_set_mac_addr(struct net_device *dev, void *p)
        /* store the MAC address in CAM */
        return (do_s2io_prog_unicast(dev, dev->dev_addr));
 }
+
 /**
  *  do_s2io_prog_unicast - Programs the Xframe mac address
  *  @dev : pointer to the device structure.
@@ -5297,6 +6899,9 @@ static int do_s2io_prog_unicast(struct net_device *dev, u8 *addr)
                perm_addr <<= 8;
                perm_addr |= sp->def_mac_addr[0].mac_addr[i];
        }
+       /* is addr is 0 or broadcast fail open */
+       if ((0 == mac_addr) || (mac_addr == S2IO_DISABLE_MAC_ENTRY))
+               return FAILURE;
 
        /* check if the dev_addr is different than perm_addr */
        if (mac_addr == perm_addr)
@@ -5326,7 +6931,8 @@ static int do_s2io_prog_unicast(struct net_device *dev, u8 *addr)
 
 /**
  * s2io_ethtool_sset - Sets different link parameters.
- * @sp : private member of the device structure, which is a pointer to the  * s2io_nic structure.
+ * @sp : private member of the device structure, which is a pointer to the
+ * s2io_nic structure.
  * @info: pointer to the structure with parameters given by ethtool to set
  * link information.
  * Description:
@@ -5341,9 +6947,10 @@ static int s2io_ethtool_sset(struct net_device *dev,
 {
        struct s2io_nic *sp = dev->priv;
        if ((info->autoneg == AUTONEG_ENABLE) ||
-           (info->speed != SPEED_10000) || (info->duplex != DUPLEX_FULL))
+               (info->speed != SPEED_10000) || (info->duplex != DUPLEX_FULL))
                return -EINVAL;
-       else {
+
+       if (netif_running(dev)) {
                s2io_close(sp->dev);
                s2io_open(sp->dev);
        }
@@ -5367,14 +6974,21 @@ static int s2io_ethtool_gset(struct net_device *dev, struct ethtool_cmd *info)
 {
        struct s2io_nic *sp = dev->priv;
        info->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
-       info->advertising = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
+#ifdef ADVERTISED_10000baseT_Full
+       info->advertising = ADVERTISED_10000baseT_Full;
+#else
+       info->advertising = SUPPORTED_10000baseT_Full;
+#endif
+#ifdef ADVERTISED_FIBRE
+       info->advertising  |= ADVERTISED_FIBRE;
+#else
+       info->advertising  |= SUPPORTED_FIBRE;
+#endif
        info->port = PORT_FIBRE;
-
-       /* info->transceiver */
        info->transceiver = XCVR_EXTERNAL;
 
        if (netif_carrier_ok(sp->dev)) {
-               info->speed = 10000;
+               info->speed = SPEED_10000;
                info->duplex = DUPLEX_FULL;
        } else {
                info->speed = -1;
@@ -5408,6 +7022,27 @@ static void s2io_ethtool_gdrvinfo(struct net_device *dev,
        strncpy(info->bus_info, pci_name(sp->pdev), sizeof(info->bus_info));
        info->regdump_len = XENA_REG_SPACE;
        info->eedump_len = XENA_EEPROM_SPACE;
+       info->testinfo_len = S2IO_TEST_LEN;
+#ifdef ETHTOOL_GSTATS
+#ifdef TITAN_LEGACY
+       if (sp->device_type == TITAN_DEVICE)
+               info->n_stats = S2IO_TITAN_STAT_LEN;
+       else
+#endif
+       {
+               if (sp->device_type == XFRAME_I_DEVICE)
+                       info->n_stats = XFRAME_I_STAT_LEN +
+                               (sp->config.tx_fifo_num * NUM_TX_SW_STAT) +
+                               (sp->config.rx_ring_num * NUM_RX_SW_STAT);
+               else
+                       info->n_stats = XFRAME_II_STAT_LEN +
+                               (sp->config.tx_fifo_num * NUM_TX_SW_STAT) +
+                               (sp->config.rx_ring_num * NUM_RX_SW_STAT);
+
+               if (!sp->exec_mode)
+                       info->n_stats += S2IO_DRIVER_DBG_STAT_LEN;
+       }
+#endif
 }
 
 /**
@@ -5500,8 +7135,8 @@ static int s2io_ethtool_idnic(struct net_device *dev, u32 data)
                ((subid & 0xFF) < 0x07)) {
                val64 = readq(&bar0->adapter_control);
                if (!(val64 & ADAPTER_CNTL_EN)) {
-                       printk(KERN_ERR
-                              "Adapter Link down, cannot blink LED\n");
+                       DBG_PRINT(ERR_DBG,
+                               "Adapter Link down, cannot blink LED\n");
                        return -EFAULT;
                }
        }
@@ -5525,36 +7160,32 @@ static int s2io_ethtool_idnic(struct net_device *dev, u32 data)
        return 0;
 }
 
+
 static void s2io_ethtool_gringparam(struct net_device *dev,
-                                    struct ethtool_ringparam *ering)
+                                   struct ethtool_ringparam *ering)
 {
        struct s2io_nic *sp = dev->priv;
-       int i,tx_desc_count=0,rx_desc_count=0;
-
-       if (sp->rxd_mode == RXD_MODE_1)
-               ering->rx_max_pending = MAX_RX_DESC_1;
-       else if (sp->rxd_mode == RXD_MODE_3B)
-               ering->rx_max_pending = MAX_RX_DESC_2;
+       int i, tx_desc_count = 0, rx_desc_count = 0;
 
+       memset(ering, 0, sizeof(struct ethtool_ringparam));
        ering->tx_max_pending = MAX_TX_DESC;
-       for (i = 0 ; i < sp->config.tx_fifo_num ; i++)
+       for (i = 0 ; i < sp->config.tx_fifo_num; i++)
                tx_desc_count += sp->config.tx_cfg[i].fifo_len;
 
-       DBG_PRINT(INFO_DBG,"\nmax txds : %d\n",sp->config.max_txds);
+       DBG_PRINT(INFO_DBG, "\nmax txds : %d\n", sp->config.max_txds);
        ering->tx_pending = tx_desc_count;
+
+       for (i = 0; i < MAX_RX_RINGS; i++)
+               ering->rx_max_pending += rx_ring_sz[i] * rxd_count[sp->rxd_mode];
+
+       ering->rx_jumbo_max_pending = ering->rx_max_pending;
        rx_desc_count = 0;
        for (i = 0 ; i < sp->config.rx_ring_num ; i++)
                rx_desc_count += sp->config.rx_cfg[i].num_rxd;
-
        ering->rx_pending = rx_desc_count;
-
+       ering->rx_jumbo_pending = rx_desc_count;
        ering->rx_mini_max_pending = 0;
        ering->rx_mini_pending = 0;
-       if(sp->rxd_mode == RXD_MODE_1)
-               ering->rx_jumbo_max_pending = MAX_RX_DESC_1;
-       else if (sp->rxd_mode == RXD_MODE_3B)
-               ering->rx_jumbo_max_pending = MAX_RX_DESC_2;
-       ering->rx_jumbo_pending = rx_desc_count;
 }
 
 /**
@@ -5568,12 +7199,13 @@ static void s2io_ethtool_gringparam(struct net_device *dev,
  *  void
  */
 static void s2io_ethtool_getpause_data(struct net_device *dev,
-                                      struct ethtool_pauseparam *ep)
+               struct ethtool_pauseparam *ep)
 {
        u64 val64;
        struct s2io_nic *sp = dev->priv;
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
 
+
        val64 = readq(&bar0->rmac_pause_cfg);
        if (val64 & RMAC_PAUSE_GEN_ENABLE)
                ep->tx_pause = TRUE;
@@ -5595,7 +7227,7 @@ static void s2io_ethtool_getpause_data(struct net_device *dev,
  */
 
 static int s2io_ethtool_setpause_data(struct net_device *dev,
-                              struct ethtool_pauseparam *ep)
+               struct ethtool_pauseparam *ep)
 {
        u64 val64;
        struct s2io_nic *sp = dev->priv;
@@ -5631,7 +7263,7 @@ static int s2io_ethtool_setpause_data(struct net_device *dev,
  */
 
 #define S2IO_DEV_ID            5
-static int read_eeprom(struct s2io_nic * sp, int off, u64 * data)
+static int read_eeprom(struct s2io_nic *sp, int off, u64 *data)
 {
        int ret = -1;
        u32 exit_cnt = 0;
@@ -5639,9 +7271,9 @@ static int read_eeprom(struct s2io_nic * sp, int off, u64 * data)
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
 
        if (sp->device_type == XFRAME_I_DEVICE) {
-               val64 = I2C_CONTROL_DEV_ID(S2IO_DEV_ID) | I2C_CONTROL_ADDR(off) |
-                   I2C_CONTROL_BYTE_CNT(0x3) | I2C_CONTROL_READ |
-                   I2C_CONTROL_CNTL_START;
+               val64 = I2C_CONTROL_DEV_ID(S2IO_DEV_ID) |
+               I2C_CONTROL_ADDR(off) | I2C_CONTROL_BYTE_CNT(0x3) |
+               I2C_CONTROL_READ | I2C_CONTROL_CNTL_START;
                SPECIAL_REG_WRITE(val64, &bar0->i2c_control, LF);
 
                while (exit_cnt < 5) {
@@ -5696,16 +7328,16 @@ static int read_eeprom(struct s2io_nic * sp, int off, u64 * data)
  *  0 on success, -1 on failure.
  */
 
-static int write_eeprom(struct s2io_nic * sp, int off, u64 data, int cnt)
+static int write_eeprom(struct s2io_nic *sp, int off, u64 data, int cnt)
 {
        int exit_cnt = 0, ret = -1;
        u64 val64;
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
 
        if (sp->device_type == XFRAME_I_DEVICE) {
-               val64 = I2C_CONTROL_DEV_ID(S2IO_DEV_ID) | I2C_CONTROL_ADDR(off) |
-                   I2C_CONTROL_BYTE_CNT(cnt) | I2C_CONTROL_SET_DATA((u32)data) |
-                   I2C_CONTROL_CNTL_START;
+               val64 = I2C_CONTROL_DEV_ID(S2IO_DEV_ID) |
+               I2C_CONTROL_ADDR(off) | I2C_CONTROL_BYTE_CNT(cnt) |
+               I2C_CONTROL_SET_DATA((u32)data) | I2C_CONTROL_CNTL_START;
                SPECIAL_REG_WRITE(val64, &bar0->i2c_control, LF);
 
                while (exit_cnt < 5) {
@@ -5745,18 +7377,19 @@ static int write_eeprom(struct s2io_nic * sp, int off, u64 data, int cnt)
        }
        return ret;
 }
+
 static void s2io_vpd_read(struct s2io_nic *nic)
 {
        u8 *vpd_data;
        u8 data;
        int i=0, cnt, fail = 0;
        int vpd_addr = 0x80;
+       struct swDbgStat *stats = nic->sw_dbg_stat;
 
        if (nic->device_type == XFRAME_II_DEVICE) {
                strcpy(nic->product_name, "Xframe II 10GbE network adapter");
                vpd_addr = 0x80;
-       }
-       else {
+       } else {
                strcpy(nic->product_name, "Xframe I 10GbE network adapter");
                vpd_addr = 0x50;
        }
@@ -5764,10 +7397,10 @@ static void s2io_vpd_read(struct s2io_nic *nic)
 
        vpd_data = kmalloc(256, GFP_KERNEL);
        if (!vpd_data) {
-               nic->mac_control.stats_info->sw_stat.mem_alloc_fail_cnt++;
+               stats->mem_alloc_fail_cnt++;
                return;
        }
-       nic->mac_control.stats_info->sw_stat.mem_allocated += 256;
+       stats->mem_allocated += 256;
 
        for (i = 0; i < 256; i +=4 ) {
                pci_write_config_byte(nic->pdev, (vpd_addr + 2), i);
@@ -5785,15 +7418,14 @@ static void s2io_vpd_read(struct s2io_nic *nic)
                        break;
                }
                pci_read_config_dword(nic->pdev,  (vpd_addr + 4),
-                                     (u32 *)&vpd_data[i]);
+                               (u32 *)&vpd_data[i]);
        }
-
-       if(!fail) {
+       if (!fail) {
                /* read serial number of adapter */
                for (cnt = 0; cnt < 256; cnt++) {
-               if ((vpd_data[cnt] == 'S') &&
-                       (vpd_data[cnt+1] == 'N') &&
-                       (vpd_data[cnt+2] < VPD_STRING_LEN)) {
+                       if ((vpd_data[cnt] == 'S') &&
+                               (vpd_data[cnt+1] == 'N') &&
+                               (vpd_data[cnt+2] < VPD_STRING_LEN)) {
                                memset(nic->serial_num, 0, VPD_STRING_LEN);
                                memcpy(nic->serial_num, &vpd_data[cnt + 3],
                                        vpd_data[cnt+2]);
@@ -5801,18 +7433,18 @@ static void s2io_vpd_read(struct s2io_nic *nic)
                        }
                }
        }
-
        if ((!fail) && (vpd_data[1] < VPD_STRING_LEN)) {
                memset(nic->product_name, 0, vpd_data[1]);
                memcpy(nic->product_name, &vpd_data[3], vpd_data[1]);
        }
        kfree(vpd_data);
-       nic->mac_control.stats_info->sw_stat.mem_freed += 256;
+       stats->mem_freed += 256;
 }
 
 /**
  *  s2io_ethtool_geeprom  - reads the value stored in the Eeprom.
- *  @sp : private member of the device structure, which is a pointer to the *       s2io_nic structure.
+ *  @sp : private member of the device structure, which is a pointer to the
+ *  s2io_nic structure.
  *  @eeprom : pointer to the user level structure provided by ethtool,
  *  containing all relevant information.
  *  @data_buf : user defined value to be written into Eeprom.
@@ -5824,7 +7456,7 @@ static void s2io_vpd_read(struct s2io_nic *nic)
  */
 
 static int s2io_ethtool_geeprom(struct net_device *dev,
-                        struct ethtool_eeprom *eeprom, u8 * data_buf)
+                        struct ethtool_eeprom *eeprom, u8 *data_buf)
 {
        u32 i, valid;
        u64 data;
@@ -5862,32 +7494,29 @@ static int s2io_ethtool_geeprom(struct net_device *dev,
 
 static int s2io_ethtool_seeprom(struct net_device *dev,
                                struct ethtool_eeprom *eeprom,
-                               u8 * data_buf)
+                               u8 *data_buf)
 {
        int len = eeprom->len, cnt = 0;
        u64 valid = 0, data;
        struct s2io_nic *sp = dev->priv;
 
        if (eeprom->magic != (sp->pdev->vendor | (sp->pdev->device << 16))) {
-               DBG_PRINT(ERR_DBG,
-                         "ETHTOOL_WRITE_EEPROM Err: Magic value ");
-               DBG_PRINT(ERR_DBG, "is wrong, Its not 0x%x\n",
-                         eeprom->magic);
+               DBG_PRINT(ERR_DBG, "ETHTOOL_WRITE_EEPROM Err: Magic value ");
+               DBG_PRINT(ERR_DBG, "is wrong, Its not 0x%x\n", eeprom->magic);
                return -EFAULT;
        }
 
        while (len) {
                data = (u32) data_buf[cnt] & 0x000000FF;
-               if (data) {
+               if (data)
                        valid = (u32) (data << 24);
-               else
+               else
                        valid = data;
 
                if (write_eeprom(sp, (eeprom->offset + cnt), valid, 0)) {
+                       DBG_PRINT(ERR_DBG, "ETHTOOL_WRITE_EEPROM Err: ");
                        DBG_PRINT(ERR_DBG,
-                                 "ETHTOOL_WRITE_EEPROM Err: Cannot ");
-                       DBG_PRINT(ERR_DBG,
-                                 "write into the specified offset\n");
+                       "Cannot write into the specified offset\n");
                        return -EFAULT;
                }
                cnt++;
@@ -5910,7 +7539,7 @@ static int s2io_ethtool_seeprom(struct net_device *dev,
  * 0 on success.
  */
 
-static int s2io_register_test(struct s2io_nic * sp, uint64_t * data)
+static int s2io_register_test(struct s2io_nic *sp, uint64_t *data)
 {
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
        u64 val64 = 0, exp_val;
@@ -5977,7 +7606,7 @@ static int s2io_register_test(struct s2io_nic * sp, uint64_t * data)
  * 0 on success.
  */
 
-static int s2io_eeprom_test(struct s2io_nic * sp, uint64_t * data)
+static int s2io_eeprom_test(struct s2io_nic *sp, uint64_t *data)
 {
        int fail = 0;
        u64 ret_data, org_4F0, org_7F0;
@@ -6079,7 +7708,7 @@ static int s2io_eeprom_test(struct s2io_nic * sp, uint64_t * data)
  * 0 on success and -1 on failure.
  */
 
-static int s2io_bist_test(struct s2io_nic * sp, uint64_t * data)
+static int s2io_bist_test(struct s2io_nic *sp, uint64_t *data)
 {
        u8 bist = 0;
        int cnt = 0, ret = -1;
@@ -6115,13 +7744,13 @@ static int s2io_bist_test(struct s2io_nic * sp, uint64_t * data)
  * 0 on success.
  */
 
-static int s2io_link_test(struct s2io_nic * sp, uint64_t * data)
+static int s2io_link_test(struct s2io_nic *sp, uint64_t *data)
 {
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
        u64 val64;
 
        val64 = readq(&bar0->adapter_status);
-       if(!(LINK_IS_UP(val64)))
+       if (!(LINK_IS_UP(val64)))
                *data = 1;
        else
                *data = 0;
@@ -6142,7 +7771,7 @@ static int s2io_link_test(struct s2io_nic * sp, uint64_t * data)
  *  0 on success.
  */
 
-static int s2io_rldram_test(struct s2io_nic * sp, uint64_t * data)
+static int s2io_rldram_test(struct s2io_nic *sp, uint64_t *data)
 {
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
        u64 val64;
@@ -6165,28 +7794,28 @@ static int s2io_rldram_test(struct s2io_nic * sp, uint64_t * data)
 
        while (iteration < 2) {
                val64 = 0x55555555aaaa0000ULL;
-               if (iteration == 1) {
+               if (iteration == 1)
                        val64 ^= 0xFFFFFFFFFFFF0000ULL;
-               }
+
                writeq(val64, &bar0->mc_rldram_test_d0);
 
                val64 = 0xaaaa5a5555550000ULL;
-               if (iteration == 1) {
+               if (iteration == 1)
                        val64 ^= 0xFFFFFFFFFFFF0000ULL;
-               }
+
                writeq(val64, &bar0->mc_rldram_test_d1);
 
                val64 = 0x55aaaaaaaa5a0000ULL;
-               if (iteration == 1) {
+               if (iteration == 1)
                        val64 ^= 0xFFFFFFFFFFFF0000ULL;
-               }
+
                writeq(val64, &bar0->mc_rldram_test_d2);
 
                val64 = (u64) (0x0000003ffffe0100ULL);
                writeq(val64, &bar0->mc_rldram_test_add);
 
                val64 = MC_RLDRAM_TEST_MODE | MC_RLDRAM_TEST_WRITE |
-                       MC_RLDRAM_TEST_GO;
+                       MC_RLDRAM_TEST_GO;
                SPECIAL_REG_WRITE(val64, &bar0->mc_rldram_test_ctrl, LF);
 
                for (cnt = 0; cnt < 5; cnt++) {
@@ -6243,8 +7872,8 @@ static int s2io_rldram_test(struct s2io_nic * sp, uint64_t * data)
  */
 
 static void s2io_ethtool_test(struct net_device *dev,
-                             struct ethtool_test *ethtest,
-                             uint64_t * data)
+                       struct ethtool_test *ethtest,
+                       uint64_t *data)
 {
        struct s2io_nic *sp = dev->priv;
        int orig_state = netif_running(sp->dev);
@@ -6278,8 +7907,8 @@ static void s2io_ethtool_test(struct net_device *dev,
                /* Online Tests. */
                if (!orig_state) {
                        DBG_PRINT(ERR_DBG,
-                                 "%s: is not up, cannot run test\n",
-                                 dev->name);
+                               "%s: is not up, cannot run test\n",
+                               dev->name);
                        data[0] = -1;
                        data[1] = -1;
                        data[2] = -1;
@@ -6297,14 +7926,40 @@ static void s2io_ethtool_test(struct net_device *dev,
        }
 }
 
+#ifdef ETHTOOL_GSTATS
 static void s2io_get_ethtool_stats(struct net_device *dev,
-                                  struct ethtool_stats *estats,
-                                  u64 * tmp_stats)
+                               struct ethtool_stats *estats,
+                               u64 *tmp_stats)
 {
-       int i = 0, k;
+       int i = 0, k = 0, j = 0;
+#ifdef TITAN_LEGACY
+       int j, index;
+#endif
        struct s2io_nic *sp = dev->priv;
        struct stat_block *stat_info = sp->mac_control.stats_info;
-
+       struct swDbgStat *stats = sp->sw_dbg_stat;
+       struct xpakStat *xpak_stat = sp->xpak_stat;
+       struct swErrStat *sw_err_stat = sp->sw_err_stat;
+       struct mac_info *mac_control = &sp->mac_control;
+#define lro_stat mac_control->rings[j].rx_ring_stat->sw_lro_stat
+#ifdef TITAN_LEGACY
+       u64 *statslinkinfo;
+
+       if (sp->device_type == TITAN_DEVICE) {
+               for (index = 0; index < MAC_LINKS; index++) {
+                       statslinkinfo = &stat_info->stats_link_info[index];
+                       for (j = 0; j < LINK_MAX; j++)
+                               tmp_stats[i++] =
+                                       le64_to_cpu(*(statslinkinfo++));
+               }
+               for (index = 0; index < MAC_AGGREGATORS; index++) {
+                       statslinkinfo = &stat_info->stats_aggr_info[index];
+                       for (j = 0; j < AGGR_MAX; j++)
+                               tmp_stats[i++] =
+                                       le64_to_cpu(*(statslinkinfo++));
+               }
+       } else {
+#endif
        s2io_updt_stats(sp);
        tmp_stats[i++] =
                (u64)le32_to_cpu(stat_info->tmac_frms_oflow) << 32  |
@@ -6320,19 +7975,19 @@ static void s2io_get_ethtool_stats(struct net_device *dev,
                (u64)le32_to_cpu(stat_info->tmac_bcst_frms_oflow) << 32 |
                le32_to_cpu(stat_info->tmac_bcst_frms);
        tmp_stats[i++] = le64_to_cpu(stat_info->tmac_pause_ctrl_frms);
-        tmp_stats[i++] =
-                (u64)le32_to_cpu(stat_info->tmac_ttl_octets_oflow) << 32 |
-                le32_to_cpu(stat_info->tmac_ttl_octets);
        tmp_stats[i++] =
-                (u64)le32_to_cpu(stat_info->tmac_ucst_frms_oflow) << 32 |
-                le32_to_cpu(stat_info->tmac_ucst_frms);
+               (u64)le32_to_cpu(stat_info->tmac_ttl_octets_oflow) << 32 |
+               le32_to_cpu(stat_info->tmac_ttl_octets);
+       tmp_stats[i++] =
+               (u64)le32_to_cpu(stat_info->tmac_ucst_frms_oflow) << 32 |
+               le32_to_cpu(stat_info->tmac_ucst_frms);
        tmp_stats[i++] =
-                (u64)le32_to_cpu(stat_info->tmac_nucst_frms_oflow) << 32 |
-                le32_to_cpu(stat_info->tmac_nucst_frms);
+               (u64)le32_to_cpu(stat_info->tmac_nucst_frms_oflow) << 32 |
+               le32_to_cpu(stat_info->tmac_nucst_frms);
        tmp_stats[i++] =
                (u64)le32_to_cpu(stat_info->tmac_any_err_frms_oflow) << 32 |
                le32_to_cpu(stat_info->tmac_any_err_frms);
-        tmp_stats[i++] = le64_to_cpu(stat_info->tmac_ttl_less_fb_octets);
+       tmp_stats[i++] = le64_to_cpu(stat_info->tmac_ttl_less_fb_octets);
        tmp_stats[i++] = le64_to_cpu(stat_info->tmac_vld_ip_octets);
        tmp_stats[i++] =
                (u64)le32_to_cpu(stat_info->tmac_vld_ip_oflow) << 32 |
@@ -6368,23 +8023,23 @@ static void s2io_get_ethtool_stats(struct net_device *dev,
        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_long_frms);
        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_pause_ctrl_frms);
        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_unsup_ctrl_frms);
-        tmp_stats[i++] =
-                (u64)le32_to_cpu(stat_info->rmac_ttl_octets_oflow) << 32 |
+       tmp_stats[i++] =
+               (u64)le32_to_cpu(stat_info->rmac_ttl_octets_oflow) << 32 |
                le32_to_cpu(stat_info->rmac_ttl_octets);
-        tmp_stats[i++] =
-                (u64)le32_to_cpu(stat_info->rmac_accepted_ucst_frms_oflow)
+       tmp_stats[i++] =
+               (u64)le32_to_cpu(stat_info->rmac_accepted_ucst_frms_oflow)
                << 32 | le32_to_cpu(stat_info->rmac_accepted_ucst_frms);
        tmp_stats[i++] =
-                (u64)le32_to_cpu(stat_info->rmac_accepted_nucst_frms_oflow)
-                 << 32 | le32_to_cpu(stat_info->rmac_accepted_nucst_frms);
+               (u64)le32_to_cpu(stat_info->rmac_accepted_nucst_frms_oflow)
+                << 32 | le32_to_cpu(stat_info->rmac_accepted_nucst_frms);
        tmp_stats[i++] =
                (u64)le32_to_cpu(stat_info->rmac_discarded_frms_oflow) << 32 |
                le32_to_cpu(stat_info->rmac_discarded_frms);
-        tmp_stats[i++] =
-                (u64)le32_to_cpu(stat_info->rmac_drop_events_oflow)
-                 << 32 | le32_to_cpu(stat_info->rmac_drop_events);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_less_fb_octets);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_frms);
+       tmp_stats[i++] =
+               (u64)le32_to_cpu(stat_info->rmac_drop_events_oflow)
+                << 32 | le32_to_cpu(stat_info->rmac_drop_events);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_less_fb_octets);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_frms);
        tmp_stats[i++] =
                (u64)le32_to_cpu(stat_info->rmac_usized_frms_oflow) << 32 |
                le32_to_cpu(stat_info->rmac_usized_frms);
@@ -6398,11 +8053,11 @@ static void s2io_get_ethtool_stats(struct net_device *dev,
                (u64)le32_to_cpu(stat_info->rmac_jabber_frms_oflow) << 32 |
                le32_to_cpu(stat_info->rmac_jabber_frms);
        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_64_frms);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_65_127_frms);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_128_255_frms);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_256_511_frms);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_512_1023_frms);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_1024_1518_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_65_127_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_128_255_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_256_511_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_512_1023_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_1024_1518_frms);
        tmp_stats[i++] =
                (u64)le32_to_cpu(stat_info->rmac_ip_oflow) << 32 |
                le32_to_cpu(stat_info->rmac_ip);
@@ -6422,27 +8077,27 @@ static void s2io_get_ethtool_stats(struct net_device *dev,
                (u64)le32_to_cpu(stat_info->rmac_err_drp_udp_oflow) << 32 |
                le32_to_cpu(stat_info->rmac_err_drp_udp);
        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_xgmii_err_sym);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q0);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q1);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q2);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q3);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q4);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q5);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q6);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q7);
-        tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q0);
-        tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q1);
-        tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q2);
-        tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q3);
-        tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q4);
-        tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q5);
-        tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q6);
-        tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q7);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q0);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q1);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q2);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q3);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q4);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q5);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q6);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_frms_q7);
+       tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q0);
+       tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q1);
+       tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q2);
+       tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q3);
+       tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q4);
+       tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q5);
+       tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q6);
+       tmp_stats[i++] = le16_to_cpu(stat_info->rmac_full_q7);
        tmp_stats[i++] =
                (u64)le32_to_cpu(stat_info->rmac_pause_cnt_oflow) << 32 |
                le32_to_cpu(stat_info->rmac_pause_cnt);
        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_xgmii_data_err_cnt);
-        tmp_stats[i++] = le64_to_cpu(stat_info->rmac_xgmii_ctrl_err_cnt);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_xgmii_ctrl_err_cnt);
        tmp_stats[i++] =
                (u64)le32_to_cpu(stat_info->rmac_accepted_ip_oflow) << 32 |
                le32_to_cpu(stat_info->rmac_accepted_ip);
@@ -6467,119 +8122,206 @@ static void s2io_get_ethtool_stats(struct net_device *dev,
        tmp_stats[i++] = le32_to_cpu(stat_info->rxf_wr_cnt);
 
        /* Enhanced statistics exist only for Hercules */
-       if(sp->device_type == XFRAME_II_DEVICE) {
-               tmp_stats[i++] =
-                               le64_to_cpu(stat_info->rmac_ttl_1519_4095_frms);
-               tmp_stats[i++] =
-                               le64_to_cpu(stat_info->rmac_ttl_4096_8191_frms);
+       if (sp->device_type == XFRAME_II_DEVICE) {
                tmp_stats[i++] =
-                               le64_to_cpu(stat_info->rmac_ttl_8192_max_frms);
-               tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_gt_max_frms);
-               tmp_stats[i++] = le64_to_cpu(stat_info->rmac_osized_alt_frms);
-               tmp_stats[i++] = le64_to_cpu(stat_info->rmac_jabber_alt_frms);
-               tmp_stats[i++] = le64_to_cpu(stat_info->rmac_gt_max_alt_frms);
-               tmp_stats[i++] = le64_to_cpu(stat_info->rmac_vlan_frms);
-               tmp_stats[i++] = le32_to_cpu(stat_info->rmac_len_discard);
-               tmp_stats[i++] = le32_to_cpu(stat_info->rmac_fcs_discard);
-               tmp_stats[i++] = le32_to_cpu(stat_info->rmac_pf_discard);
-               tmp_stats[i++] = le32_to_cpu(stat_info->rmac_da_discard);
-               tmp_stats[i++] = le32_to_cpu(stat_info->rmac_red_discard);
-               tmp_stats[i++] = le32_to_cpu(stat_info->rmac_rts_discard);
-               tmp_stats[i++] = le32_to_cpu(stat_info->rmac_ingm_full_discard);
-               tmp_stats[i++] = le32_to_cpu(stat_info->link_fault_cnt);
+                       le64_to_cpu(stat_info->rmac_ttl_1519_4095_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_4096_8191_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_8192_max_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_ttl_gt_max_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_osized_alt_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_jabber_alt_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_gt_max_alt_frms);
+       tmp_stats[i++] = le64_to_cpu(stat_info->rmac_vlan_frms);
+       tmp_stats[i++] = le32_to_cpu(stat_info->rmac_len_discard);
+       tmp_stats[i++] = le32_to_cpu(stat_info->rmac_fcs_discard);
+       tmp_stats[i++] = le32_to_cpu(stat_info->rmac_pf_discard);
+       tmp_stats[i++] = le32_to_cpu(stat_info->rmac_da_discard);
+       tmp_stats[i++] = le32_to_cpu(stat_info->rmac_wol_discard);
+       tmp_stats[i++] = le32_to_cpu(stat_info->rmac_rts_discard);
+       tmp_stats[i++] = le32_to_cpu(stat_info->rmac_ingm_full_discard);
+       tmp_stats[i++] = le32_to_cpu(stat_info->rmac_red_discard);
+       tmp_stats[i++] = le32_to_cpu(stat_info->link_fault_cnt);
        }
 
        tmp_stats[i++] = 0;
-       tmp_stats[i++] = stat_info->sw_stat.single_ecc_errs;
-       tmp_stats[i++] = stat_info->sw_stat.double_ecc_errs;
-       tmp_stats[i++] = stat_info->sw_stat.parity_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.serious_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.soft_reset_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.fifo_full_cnt;
-       for (k = 0; k < MAX_RX_RINGS; k++)
-               tmp_stats[i++] = stat_info->sw_stat.ring_full_cnt[k];
-       tmp_stats[i++] = stat_info->xpak_stat.alarm_transceiver_temp_high;
-       tmp_stats[i++] = stat_info->xpak_stat.alarm_transceiver_temp_low;
-       tmp_stats[i++] = stat_info->xpak_stat.alarm_laser_bias_current_high;
-       tmp_stats[i++] = stat_info->xpak_stat.alarm_laser_bias_current_low;
-       tmp_stats[i++] = stat_info->xpak_stat.alarm_laser_output_power_high;
-       tmp_stats[i++] = stat_info->xpak_stat.alarm_laser_output_power_low;
-       tmp_stats[i++] = stat_info->xpak_stat.warn_transceiver_temp_high;
-       tmp_stats[i++] = stat_info->xpak_stat.warn_transceiver_temp_low;
-       tmp_stats[i++] = stat_info->xpak_stat.warn_laser_bias_current_high;
-       tmp_stats[i++] = stat_info->xpak_stat.warn_laser_bias_current_low;
-       tmp_stats[i++] = stat_info->xpak_stat.warn_laser_output_power_high;
-       tmp_stats[i++] = stat_info->xpak_stat.warn_laser_output_power_low;
-       tmp_stats[i++] = stat_info->sw_stat.clubbed_frms_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.sending_both;
-       tmp_stats[i++] = stat_info->sw_stat.outof_sequence_pkts;
-       tmp_stats[i++] = stat_info->sw_stat.flush_max_pkts;
-       if (stat_info->sw_stat.num_aggregations) {
-               u64 tmp = stat_info->sw_stat.sum_avg_pkts_aggregated;
-               int count = 0;
-               /*
-                * Since 64-bit divide does not work on all platforms,
-                * do repeated subtraction.
-                */
-               while (tmp >= stat_info->sw_stat.num_aggregations) {
-                       tmp -= stat_info->sw_stat.num_aggregations;
-                       count++;
+       tmp_stats[i++] = xpak_stat->alarm_transceiver_temp_high;
+       tmp_stats[i++] = xpak_stat->alarm_transceiver_temp_low;
+       tmp_stats[i++] = xpak_stat->alarm_laser_bias_current_high;
+       tmp_stats[i++] = xpak_stat->alarm_laser_bias_current_low;
+       tmp_stats[i++] = xpak_stat->alarm_laser_output_power_high;
+       tmp_stats[i++] = xpak_stat->alarm_laser_output_power_low;
+       tmp_stats[i++] = xpak_stat->warn_transceiver_temp_high;
+       tmp_stats[i++] = xpak_stat->warn_transceiver_temp_low;
+       tmp_stats[i++] = xpak_stat->warn_laser_bias_current_high;
+       tmp_stats[i++] = xpak_stat->warn_laser_bias_current_low;
+       tmp_stats[i++] = xpak_stat->warn_laser_output_power_high;
+       tmp_stats[i++] = xpak_stat->warn_laser_output_power_low;
+
+       tmp_stats[i++] = sw_err_stat->single_ecc_errs;
+       tmp_stats[i++] = sw_err_stat->double_ecc_errs;
+       tmp_stats[i++] = sw_err_stat->parity_err_cnt;
+       tmp_stats[i++] = sw_err_stat->serious_err_cnt;
+       tmp_stats[i++] = sw_err_stat->soft_reset_cnt;
+       tmp_stats[i++] = sw_err_stat->watchdog_timer_cnt;
+
+       tmp_stats[i++] = sw_err_stat->skb_null_s2io_xmit_cnt;
+       tmp_stats[i++] = sw_err_stat->skb_null_tx_intr_handler_cnt;
+
+       tmp_stats[i++] = sw_err_stat->tda_err_cnt;
+       tmp_stats[i++] = sw_err_stat->pfc_err_cnt;
+       tmp_stats[i++] = sw_err_stat->pcc_err_cnt;
+       tmp_stats[i++] = sw_err_stat->tti_err_cnt;
+       tmp_stats[i++] = sw_err_stat->tpa_err_cnt;
+       tmp_stats[i++] = sw_err_stat->sm_err_cnt;
+       tmp_stats[i++] = sw_err_stat->lso_err_cnt;
+       tmp_stats[i++] = sw_err_stat->mac_tmac_err_cnt;
+       tmp_stats[i++] = sw_err_stat->mac_rmac_err_cnt;
+       tmp_stats[i++] = sw_err_stat->xgxs_txgxs_err_cnt;
+       tmp_stats[i++] = sw_err_stat->xgxs_rxgxs_err_cnt;
+       tmp_stats[i++] = sw_err_stat->rc_err_cnt;
+       tmp_stats[i++] = sw_err_stat->prc_pcix_err_cnt;
+       tmp_stats[i++] = sw_err_stat->rpa_err_cnt;
+       tmp_stats[i++] = sw_err_stat->rda_err_cnt;
+       tmp_stats[i++] = sw_err_stat->rti_err_cnt;
+       tmp_stats[i++] = sw_err_stat->mc_err_cnt;
+
+       tmp_stats[i++] = sp->tx_intr_cnt;
+       tmp_stats[i++] = sp->rx_intr_cnt;
+
+
+       for (k = 0; k < sp->config.tx_fifo_num; k++)
+               tmp_stats[i++] =
+                       mac_control->fifos[k].tx_fifo_stat->fifo_full_cnt;
+       for (k = 0; k < sp->config.tx_fifo_num; k++)
+               tmp_stats[i++] =
+                       mac_control->fifos[k].tx_fifo_stat->tx_buf_abort_cnt;
+       for (k = 0; k < sp->config.tx_fifo_num; k++)
+               tmp_stats[i++] =
+                       mac_control->fifos[k].tx_fifo_stat->tx_desc_abort_cnt;
+       for (k = 0; k < sp->config.tx_fifo_num; k++)
+               tmp_stats[i++] =
+                       mac_control->fifos[k].tx_fifo_stat->tx_parity_err_cnt;
+       for (k = 0; k < sp->config.tx_fifo_num; k++)
+               tmp_stats[i++] =
+                       mac_control->fifos[k].tx_fifo_stat->tx_link_loss_cnt;
+       for (k = 0; k < sp->config.tx_fifo_num; k++)
+               tmp_stats[i++] =
+               mac_control->fifos[k].tx_fifo_stat->tx_list_proc_err_cnt;
+
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->ring_full_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_parity_err_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_abort_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_parity_abort_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_rda_fail_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_unkn_prot_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_fcs_err_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_buf_size_err_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_rxd_corrupt_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_unkn_err_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->
+                               rx_mem_alloc_fail_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_pci_map_fail_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->
+                               skb_null_rx_intr_handler_cnt;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_mem_allocated;
+       for (k = 0; k < sp->config.rx_ring_num; k++)
+               tmp_stats[i++] =
+                       mac_control->rings[k].rx_ring_stat->rx_mem_freed;
+
+       for (j = 0; j < sp->config.rx_ring_num; j++) {
+               tmp_stats[i++] = lro_stat.clubbed_frms_cnt;
+               tmp_stats[i++] = lro_stat.sending_both;
+               tmp_stats[i++] = lro_stat.outof_sequence_pkts;
+               tmp_stats[i++] = lro_stat.flush_max_pkts;
+
+               if (lro_stat.num_aggregations) {
+                       u64 tmp = lro_stat.sum_avg_pkts_aggregated;
+                       int count = 0;
+                       /*
+                        * Since 64-bit divide does not work on all platforms,
+                        * do repeated subtraction.
+                        */
+                       while (tmp >= lro_stat.num_aggregations) {
+                               tmp -= lro_stat.num_aggregations;
+                               count++;
+                       }
+                       tmp_stats[i++] = count;
+               }
+               else
+                       tmp_stats[i++] = 0;
+
+               tmp_stats[i] = 0;
+               for (k = 0; k < MAX_RX_RINGS; k++) {
+                       if (sp->mac_control.rings[k].max_pkts_aggr >
+                                                               tmp_stats[i])
+                                tmp_stats[i] =
+                                       sp->mac_control.rings[k].max_pkts_aggr;
                }
-               tmp_stats[i++] = count;
+               i++;
+       }
+
+       /* Don't print these statistics in release mode */
+       if (!sp->exec_mode) {
+               for (k = 0; k < MAX_TX_FIFOS; k++)
+                       tmp_stats[i++] = sp->sw_dbg_stat->tmac_frms_q[k];
+               tmp_stats[i++] = sp->sw_dbg_stat->mem_alloc_fail_cnt;
+               tmp_stats[i++] = sp->sw_dbg_stat->pci_map_fail_cnt;
+               tmp_stats[i++] = sp->sw_dbg_stat->mem_allocated;
+               tmp_stats[i++] = sp->sw_dbg_stat->mem_freed;
+               tmp_stats[i++] = sp->sw_dbg_stat->link_up_cnt;
+               tmp_stats[i++] = sp->sw_dbg_stat->link_down_cnt;
+               if (sp->last_link_state == LINK_UP)
+                       stats->link_up_time
+                               = jiffies - sp->start_time;
+               tmp_stats[i++] = sp->sw_dbg_stat->link_up_time;
+               if (sp->last_link_state == LINK_DOWN)
+                       stats->link_down_time
+                               = jiffies - sp->start_time;
+               tmp_stats[i++] = sp->sw_dbg_stat->link_down_time;
+       }
+
+#ifdef TITAN_LEGAY
        }
-       else
-               tmp_stats[i++] = 0;
-       tmp_stats[i++] = stat_info->sw_stat.mem_alloc_fail_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.pci_map_fail_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.watchdog_timer_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.mem_allocated;
-       tmp_stats[i++] = stat_info->sw_stat.mem_freed;
-       tmp_stats[i++] = stat_info->sw_stat.link_up_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.link_down_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.link_up_time;
-       tmp_stats[i++] = stat_info->sw_stat.link_down_time;
-
-       tmp_stats[i++] = stat_info->sw_stat.tx_buf_abort_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.tx_desc_abort_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.tx_parity_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.tx_link_loss_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.tx_list_proc_err_cnt;
-
-       tmp_stats[i++] = stat_info->sw_stat.rx_parity_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rx_abort_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rx_parity_abort_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rx_rda_fail_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rx_unkn_prot_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rx_fcs_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rx_buf_size_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rx_rxd_corrupt_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rx_unkn_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.tda_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.pfc_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.pcc_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.tti_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.tpa_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.sm_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.lso_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.mac_tmac_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.mac_rmac_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.xgxs_txgxs_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.xgxs_rxgxs_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rc_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.prc_pcix_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rpa_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rda_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.rti_err_cnt;
-       tmp_stats[i++] = stat_info->sw_stat.mc_err_cnt;
+#endif
 }
+#endif
 
+#ifdef SET_ETHTOOL_OPS
 static int s2io_ethtool_get_regs_len(struct net_device *dev)
 {
        return (XENA_REG_SPACE);
 }
 
 
-static u32 s2io_ethtool_get_rx_csum(struct net_device * dev)
+static u32 s2io_ethtool_get_rx_csum(struct net_device *dev)
 {
        struct s2io_nic *sp = dev->priv;
 
@@ -6589,45 +8331,45 @@ static u32 s2io_ethtool_get_rx_csum(struct net_device * dev)
 static int s2io_ethtool_set_rx_csum(struct net_device *dev, u32 data)
 {
        struct s2io_nic *sp = dev->priv;
+       int i;
 
        if (data)
                sp->rx_csum = 1;
        else
                sp->rx_csum = 0;
 
+       for (i = 0; i < sp->config.rx_ring_num; i++)
+               sp->mac_control.rings[i].rx_csum = sp->rx_csum;
+
        return 0;
 }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 00)) || \
+    (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 23))
 static int s2io_get_eeprom_len(struct net_device *dev)
 {
        return (XENA_EEPROM_SPACE);
 }
+#endif
 
-static int s2io_get_sset_count(struct net_device *dev, int sset)
+static int s2io_ethtool_self_test_count(struct net_device *dev)
 {
-       struct s2io_nic *sp = dev->priv;
+       return (S2IO_TEST_LEN);
+}
 
-       switch (sset) {
-       case ETH_SS_TEST:
-               return S2IO_TEST_LEN;
-       case ETH_SS_STATS:
-               switch(sp->device_type) {
-               case XFRAME_I_DEVICE:
-                       return XFRAME_I_STAT_LEN;
-               case XFRAME_II_DEVICE:
-                       return XFRAME_II_STAT_LEN;
-               default:
-                       return 0;
-               }
-       default:
-               return -EOPNOTSUPP;
-       }
+void add_print_string(char *prnt_string, int j, int *stat_size, u8 *data,
+       struct s2io_nic *sp)
+{
+       char data_string[ETH_GSTRING_LEN] = {};
+       sprintf(data_string, prnt_string, j);
+       memcpy(data + *stat_size, data_string, ETH_GSTRING_LEN);
+       *stat_size += ETH_GSTRING_LEN;
 }
 
 static void s2io_ethtool_get_strings(struct net_device *dev,
-                                    u32 stringset, u8 * data)
+                                    u32 stringset, u8 *data)
 {
-       int stat_size = 0;
+       int stat_size = 0, i;
        struct s2io_nic *sp = dev->priv;
 
        switch (stringset) {
@@ -6635,34 +8377,208 @@ static void s2io_ethtool_get_strings(struct net_device *dev,
                memcpy(data, s2io_gstrings, S2IO_STRINGS_LEN);
                break;
        case ETH_SS_STATS:
+#ifdef TITAN_LEGACY
+       if (sp->device_type == TITAN_DEVICE)
+               memcpy(data, &ethtool_titan_stats_keys,
+                       sizeof(ethtool_titan_stats_keys));
+       else
+#endif
+       {
                stat_size = sizeof(ethtool_xena_stats_keys);
-               memcpy(data, &ethtool_xena_stats_keys,stat_size);
-               if(sp->device_type == XFRAME_II_DEVICE) {
+               memcpy(data, &ethtool_xena_stats_keys, stat_size);
+
+               if (sp->device_type == XFRAME_II_DEVICE) {
                        memcpy(data + stat_size,
                                &ethtool_enhanced_stats_keys,
                                sizeof(ethtool_enhanced_stats_keys));
                        stat_size += sizeof(ethtool_enhanced_stats_keys);
                }
 
-               memcpy(data + stat_size, &ethtool_driver_stats_keys,
+               memcpy(data + stat_size,
+                       &ethtool_driver_stats_keys,
                        sizeof(ethtool_driver_stats_keys));
+               stat_size += sizeof(ethtool_driver_stats_keys);
+
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       add_print_string("fifo_full_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       add_print_string("tx_buf_abort_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       add_print_string("tx_desc_abort_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       add_print_string("tx_parity_err_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       add_print_string("tx_link_loss_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.tx_fifo_num; i++)
+                       add_print_string("tx_list_proc_err_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("ring_full_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_parity_err_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_abort_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_parity_abort_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_rda_fail_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_unkn_prot_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_fcs_err_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_buf_size_err_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_rxd_corrupt_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_unkn_err_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_mem_alloc_fail_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_pci_map_fail_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("skb_null_rx_intr_handler_cnt_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_mem_allocated_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       add_print_string("rx_mem_freed_%d",
+                               i, &stat_size, data, sp);
+
+               for (i = 0; i < sp->config.rx_ring_num; i++) {
+                       add_print_string("lro_aggregated_pkts_%d\t\t",
+                               i, &stat_size, data, sp);
+                       add_print_string("lro_flush_both_count_%d\t\t",
+                               i, &stat_size, data, sp);
+                       add_print_string("lro_out_of_sequence_pkts_%d\t\t",
+                               i, &stat_size, data, sp);
+                       add_print_string("lro_flush_due_to_max_pkts_%d\t",
+                               i, &stat_size, data, sp);
+                       add_print_string("lro_avg_aggr_pkts_%d\t\t",
+                               i, &stat_size, data, sp);
+                       add_print_string("lro_max_pkts_aggr_%d\t\t",
+                               i, &stat_size, data, sp);
+               }
+
+               if (!sp->exec_mode)
+                       memcpy(data + stat_size,
+                               &ethtool_driver_dbg_stats_keys,
+                               sizeof(ethtool_driver_dbg_stats_keys));
+               }
+       }
+}
+
+static int s2io_ethtool_get_stats_count(struct net_device *dev)
+{
+       struct s2io_nic *sp = dev->priv;
+       int stat_count = 0;
+
+       switch (sp->device_type) {
+
+#ifdef TITAN_LEGACY
+       case TITAN_DEVICE:
+               stat_count = S2IO_TITAN_STAT_COUNT;
+       break;
+#endif
+       case XFRAME_I_DEVICE:
+               stat_count = XFRAME_I_STAT_LEN +
+                       (sp->config.tx_fifo_num * NUM_TX_SW_STAT) +
+                       (sp->config.rx_ring_num * NUM_RX_SW_STAT);
+               if (!sp->exec_mode)
+                       stat_count += S2IO_DRIVER_DBG_STAT_LEN;
+       break;
+
+       case XFRAME_II_DEVICE:
+               stat_count = XFRAME_II_STAT_LEN +
+                       (sp->config.tx_fifo_num * NUM_TX_SW_STAT) +
+                       (sp->config.rx_ring_num * NUM_RX_SW_STAT);
+               if (!sp->exec_mode)
+                       stat_count += S2IO_DRIVER_DBG_STAT_LEN;
+       break;
        }
+
+       return stat_count;
+}
+
+static u32 s2io_ethtool_get_link(struct net_device *dev)
+{
+               u64 val64 = 0;
+               struct s2io_nic *sp = dev->priv;
+               struct XENA_dev_config __iomem *bar0 = sp->bar0;
+
+               val64 = netif_carrier_ok(dev);
+               if (val64) {
+                       /* Verify Adapter_Enable bit which automatically
+                       * transitions to 0 in the event of a link fault
+                       */
+                       val64 = readq(&bar0->adapter_control);
+               }
+       return (val64 & ADAPTER_CNTL_EN) ? 1 : 0;
 }
 
 static int s2io_ethtool_op_set_tx_csum(struct net_device *dev, u32 data)
 {
-       if (data)
-               dev->features |= NETIF_F_IP_CSUM;
-       else
+       struct s2io_nic *sp = dev->priv;
+
+       if (data) {
+               if (sp->device_type == XFRAME_II_DEVICE)
+                       dev->features |= NETIF_F_HW_CSUM;
+               else
+                       dev->features |= NETIF_F_IP_CSUM;
+       } else {
                dev->features &= ~NETIF_F_IP_CSUM;
+               if (sp->device_type == XFRAME_II_DEVICE)
+                       dev->features &= ~NETIF_F_HW_CSUM;
+       }
 
        return 0;
 }
 
+
+#ifdef NETIF_F_TSO6
 static u32 s2io_ethtool_op_get_tso(struct net_device *dev)
 {
        return (dev->features & NETIF_F_TSO) != 0;
 }
+
 static int s2io_ethtool_op_set_tso(struct net_device *dev, u32 data)
 {
        if (data)
@@ -6672,6 +8588,7 @@ static int s2io_ethtool_op_set_tso(struct net_device *dev, u32 data)
 
        return 0;
 }
+#endif
 
 static const struct ethtool_ops netdev_ethtool_ops = {
        .get_settings = s2io_ethtool_gset,
@@ -6679,8 +8596,11 @@ static const struct ethtool_ops netdev_ethtool_ops = {
        .get_drvinfo = s2io_ethtool_gdrvinfo,
        .get_regs_len = s2io_ethtool_get_regs_len,
        .get_regs = s2io_ethtool_gregs,
-       .get_link = ethtool_op_get_link,
+       .get_link = s2io_ethtool_get_link,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 00)) || \
+    (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 23))
        .get_eeprom_len = s2io_get_eeprom_len,
+#endif
        .get_eeprom = s2io_ethtool_geeprom,
        .set_eeprom = s2io_ethtool_seeprom,
        .get_ringparam = s2io_ethtool_gringparam,
@@ -6688,17 +8608,26 @@ static const struct ethtool_ops netdev_ethtool_ops = {
        .set_pauseparam = s2io_ethtool_setpause_data,
        .get_rx_csum = s2io_ethtool_get_rx_csum,
        .set_rx_csum = s2io_ethtool_set_rx_csum,
+       .get_tx_csum = ethtool_op_get_tx_csum,
        .set_tx_csum = s2io_ethtool_op_set_tx_csum,
+       .get_sg = ethtool_op_get_sg,
        .set_sg = ethtool_op_set_sg,
+#ifdef NETIF_F_TSO
        .get_tso = s2io_ethtool_op_get_tso,
        .set_tso = s2io_ethtool_op_set_tso,
+#endif
+#ifdef NETIF_F_UFO
+       .get_ufo = ethtool_op_get_ufo,
        .set_ufo = ethtool_op_set_ufo,
+#endif
+       .self_test_count = s2io_ethtool_self_test_count,
        .self_test = s2io_ethtool_test,
        .get_strings = s2io_ethtool_get_strings,
        .phys_id = s2io_ethtool_idnic,
-       .get_ethtool_stats = s2io_get_ethtool_stats,
-       .get_sset_count = s2io_get_sset_count,
+       .get_stats_count = s2io_ethtool_get_stats_count,
+       .get_ethtool_stats = s2io_get_ethtool_stats
 };
+#endif
 
 /**
  *  s2io_ioctl - Entry point for the Ioctl
@@ -6708,13 +8637,43 @@ static const struct ethtool_ops netdev_ethtool_ops = {
  *  @cmd :  This is used to distinguish between the different commands that
  *  can be passed to the IOCTL functions.
  *  Description:
- *  Currently there are no special functionality supported in IOCTL, hence
- *  function always return EOPNOTSUPPORTED
+ *  This function has support for ethtool, adding multiple MAC addresses on
+ *  the NIC and some DBG commands for the util tool.
+ *  Return value:
+ *  0 on success and an appropriate (-)ve integer as defined in errno.h
+ *  file on failure.
  */
 
 static int s2io_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
-       return -EOPNOTSUPP;
+       struct s2io_nic *sp = dev->priv;
+
+       switch (cmd) {
+#ifndef SET_ETHTOOL_OPS
+       case SIOCETHTOOL:
+               return s2io_ethtool(dev, rq);
+#endif
+       default:
+               if (s2io_ioctl_util(sp, rq, cmd) < 0)
+                       return -EFAULT;
+       }
+       return SUCCESS;
+}
+
+int s2io_restart_card(struct s2io_nic *sp)
+{
+       int ret = 0;
+       if (test_and_set_bit(__S2IO_STATE_RESET_CARD, &(sp->state)))
+               return -1;
+       s2io_card_down(sp);
+       ret = s2io_card_up(sp);
+       if (ret) {
+               DBG_PRINT(ERR_DBG, "%s: Device bring up failed\n",
+                               __FUNCTION__);
+               return ret;
+       }
+       clear_bit(__S2IO_STATE_RESET_CARD, &(sp->state));
+       return ret;
 }
 
 /**
@@ -6733,22 +8692,20 @@ static int s2io_change_mtu(struct net_device *dev, int new_mtu)
        struct s2io_nic *sp = dev->priv;
        int ret = 0;
 
-       if ((new_mtu < MIN_MTU) || (new_mtu > S2IO_JUMBO_SIZE)) {
+       if ((new_mtu < MIN_MTU) || (new_mtu > MAX_PYLD_JUMBO)) {
                DBG_PRINT(ERR_DBG, "%s: MTU size is invalid.\n",
                          dev->name);
                return -EPERM;
        }
 
        dev->mtu = new_mtu;
+
        if (netif_running(dev)) {
                s2io_stop_all_tx_queue(sp);
-               s2io_card_down(sp);
-               ret = s2io_card_up(sp);
-               if (ret) {
-                       DBG_PRINT(ERR_DBG, "%s: Device bring up failed\n",
-                                 __FUNCTION__);
+
+               ret = s2io_restart_card(sp);
+               if (ret)
                        return ret;
-               }
                s2io_wake_all_tx_queue(sp);
        } else { /* Device is down */
                struct XENA_dev_config __iomem *bar0 = sp->bar0;
@@ -6757,6 +8714,8 @@ static int s2io_change_mtu(struct net_device *dev, int new_mtu)
                writeq(vBIT(val64, 2, 14), &bar0->rmac_max_pyld_len);
        }
 
+       DBG_PRINT(ERR_DBG, "%s: MTU is changed to %d\n", dev->name, new_mtu);
+
        return ret;
 }
 
@@ -6766,22 +8725,28 @@ static int s2io_change_mtu(struct net_device *dev, int new_mtu)
  * Description: Sets the link status for the adapter
  */
 
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19))
+static void s2io_set_link(unsigned long data)
+{
+       struct s2io_nic *nic = (struct s2io_nic *) data;
+       struct net_device *dev = nic->dev;
+#else
 static void s2io_set_link(struct work_struct *work)
 {
-       struct s2io_nic *nic = container_of(work, struct s2io_nic, set_link_task);
+       struct s2io_nic *nic = container_of(work, struct s2io_nic,
+                       set_link_task);
        struct net_device *dev = nic->dev;
+#endif
        struct XENA_dev_config __iomem *bar0 = nic->bar0;
        register u64 val64;
        u16 subid;
 
-       rtnl_lock();
-
        if (!netif_running(dev))
-               goto out_unlock;
+               return;
 
-       if (test_and_set_bit(__S2IO_STATE_LINK_TASK, &(nic->state))) {
+       if (test_and_set_bit(__S2IO_STATE_LINK_RESET_TASK, &(nic->state))) {
                /* The card is being reset, no point doing anything */
-               goto out_unlock;
+               return;
        }
 
        subid = nic->pdev->subsystem_device;
@@ -6792,14 +8757,14 @@ static void s2io_set_link(struct work_struct *work)
                 */
                msleep(100);
        }
-
        val64 = readq(&bar0->adapter_status);
        if (LINK_IS_UP(val64)) {
-               if (!(readq(&bar0->adapter_control) & ADAPTER_CNTL_EN)) {
+               if (nic->device_type == XFRAME_I_DEVICE) {
                        if (verify_xena_quiescence(nic)) {
                                val64 = readq(&bar0->adapter_control);
                                val64 |= ADAPTER_CNTL_EN;
                                writeq(val64, &bar0->adapter_control);
+
                                if (CARDS_WITH_FAULTY_LINK_INDICATORS(
                                        nic->device_type, subid)) {
                                        val64 = readq(&bar0->gpio_control);
@@ -6813,17 +8778,22 @@ static void s2io_set_link(struct work_struct *work)
                                nic->device_enabled_once = TRUE;
                        } else {
                                DBG_PRINT(ERR_DBG, "%s: Error: ", dev->name);
-                               DBG_PRINT(ERR_DBG, "device is not Quiescent\n");
+                               DBG_PRINT(ERR_DBG,
+                                       "device is not Quiescent\n");
                                s2io_stop_all_tx_queue(nic);
                        }
+               } else {
+                       val64 = readq(&bar0->adapter_control);
+                       val64 |= ADAPTER_CNTL_EN;
+                       writeq(val64, &bar0->adapter_control);
+                       val64 |= ADAPTER_LED_ON;
+                       writeq(val64, &bar0->adapter_control);
+                       nic->device_enabled_once = TRUE;
                }
-               val64 = readq(&bar0->adapter_control);
-               val64 |= ADAPTER_LED_ON;
-               writeq(val64, &bar0->adapter_control);
                s2io_link(nic, LINK_UP);
        } else {
                if (CARDS_WITH_FAULTY_LINK_INDICATORS(nic->device_type,
-                                                     subid)) {
+                               subid)) {
                        val64 = readq(&bar0->gpio_control);
                        val64 &= ~GPIO_CTRL_GPIO_0;
                        writeq(val64, &bar0->gpio_control);
@@ -6831,62 +8801,240 @@ static void s2io_set_link(struct work_struct *work)
                }
                /* turn off LED */
                val64 = readq(&bar0->adapter_control);
-               val64 = val64 &(~ADAPTER_LED_ON);
+               val64 = val64 & (~ADAPTER_LED_ON);
                writeq(val64, &bar0->adapter_control);
                s2io_link(nic, LINK_DOWN);
        }
-       clear_bit(__S2IO_STATE_LINK_TASK, &(nic->state));
-
-out_unlock:
-       rtnl_unlock();
+       clear_bit(__S2IO_STATE_LINK_RESET_TASK, &(nic->state));
 }
 
-static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
+static int set_rxd_buffer_pointer(struct ring_info *ring, struct RxD_t *rxdp,
                                struct buffAdd *ba,
                                struct sk_buff **skb, u64 *temp0, u64 *temp1,
-                               u64 *temp2, int size)
+                               u64 *temp2, u64 *temp3, u64 *temp4, int size,
+                               int rxd_index)
 {
-       struct net_device *dev = sp->dev;
-       struct swStat *stats = &sp->mac_control.stats_info->sw_stat;
+       struct sk_buff *frag_list;
+       struct RxD1 *rxdp1;
+       struct RxD3 *rxdp3;
+       struct RxD5 *rxdp5;
+       struct rxRingStat *stats = ring->rx_ring_stat;
+
+       if (ring->rxd_mode == RXD_MODE_5) {
+               if (((struct RxD5 *)rxdp)->Host_Control)
+                       return 0;
+       } else
+               if (rxdp->Host_Control)
+                       return 0;
 
-       if ((sp->rxd_mode == RXD_MODE_1) && (rxdp->Host_Control == 0)) {
-               struct RxD1 *rxdp1 = (struct RxD1 *)rxdp;
+       switch (ring->rxd_mode) {
+       case RXD_MODE_1:
                /* allocate skb */
+               rxdp1 = (struct RxD1 *)rxdp;
                if (*skb) {
                        DBG_PRINT(INFO_DBG, "SKB is not NULL\n");
                        /*
-                        * As Rx frame are not going to be processed,
-                        * using same mapped address for the Rxd
-                        * buffer pointer
-                        */
+                       * As Rx frame are not going to be processed,
+                       * using same mapped address for the Rxd
+                       * buffer pointer
+                       */
                        rxdp1->Buffer0_ptr = *temp0;
                } else {
                        *skb = dev_alloc_skb(size);
                        if (!(*skb)) {
-                               DBG_PRINT(INFO_DBG, "%s: Out of ", dev->name);
+                               DBG_PRINT(INFO_DBG, "%s: Out of ",
+                                       ring->dev->name);
                                DBG_PRINT(INFO_DBG, "memory to allocate ");
                                DBG_PRINT(INFO_DBG, "1 buf mode SKBs\n");
-                               sp->mac_control.stats_info->sw_stat. \
-                                       mem_alloc_fail_cnt++;
+                               stats->rx_mem_alloc_fail_cnt++;
                                return -ENOMEM ;
                        }
-                       sp->mac_control.stats_info->sw_stat.mem_allocated
-                               += (*skb)->truesize;
+                       stats->rx_mem_allocated += (*skb)->truesize;
                        /* storing the mapped addr in a temp variable
                         * such it will be used for next rxd whose
                         * Host Control is NULL
                         */
                        rxdp1->Buffer0_ptr = *temp0 =
-                               pci_map_single( sp->pdev, (*skb)->data,
-                                       size - NET_IP_ALIGN,
-                                       PCI_DMA_FROMDEVICE);
-                       if (pci_dma_mapping_error(sp->pdev, rxdp1->Buffer0_ptr))
-                               goto memalloc_failed;
+                               pci_map_single(ring->pdev, (*skb)->data,
+                               size - NET_IP_ALIGN,
+                               PCI_DMA_FROMDEVICE);
+                       if ((rxdp1->Buffer0_ptr == 0) ||
+                               (rxdp1->Buffer0_ptr == DMA_ERROR_CODE)) {
+                               stats->rx_pci_map_fail_cnt++;
+                               stats->rx_mem_freed += (*skb)->truesize;
+                               dev_kfree_skb(*skb);
+                               return -ENOMEM;
+                       }
                        rxdp->Host_Control = (unsigned long) (*skb);
                }
-       } else if ((sp->rxd_mode == RXD_MODE_3B) && (rxdp->Host_Control == 0)) {
-               struct RxD3 *rxdp3 = (struct RxD3 *)rxdp;
-               /* Two buffer Mode */
+               break;
+
+       case RXD_MODE_5:
+               rxdp5 = (struct RxD5 *)rxdp;
+               if (*skb) {
+                       rxdp5->Buffer0_ptr = *temp0;
+                       rxdp5->Buffer1_ptr = *temp1;
+                       rxdp5->Buffer2_ptr = *temp2;
+                       rxdp5->Buffer3_ptr = *temp3;
+                       rxdp5->Buffer4_ptr = *temp4;
+               } else {
+                       /* Allocate Buffer 0 */
+                       *skb = dev_alloc_skb(size);
+                       if (!(*skb)) {
+                               DBG_PRINT(INFO_DBG, "%s: Out of ",
+                                       ring->dev->name);
+                               DBG_PRINT(INFO_DBG, "memory to allocate ");
+                               DBG_PRINT(INFO_DBG, "5 buf mode SKBs\n");
+                               stats->rx_mem_alloc_fail_cnt++;
+                               return -ENOMEM ;
+                       }
+
+                       stats->rx_mem_allocated += (*skb)->truesize;
+                       rxdp5->Buffer0_ptr = *temp0 =
+                               pci_map_single(ring->pdev, ba->ba_0, BUF0_LEN,
+                               PCI_DMA_FROMDEVICE);
+                       if ((rxdp5->Buffer0_ptr == 0) ||
+                               (rxdp5->Buffer0_ptr == DMA_ERROR_CODE))
+                                       goto free_5b_0;
+
+                       /* Buffer-1 receives L3/L4 headers */
+                       rxdp5->Buffer1_ptr = *temp1 =
+                               pci_map_single(ring->pdev, (*skb)->data,
+                               l3l4hdr_size + 4,
+                               PCI_DMA_FROMDEVICE);
+                       if ((rxdp5->Buffer1_ptr == 0) ||
+                               (rxdp5->Buffer1_ptr == DMA_ERROR_CODE))
+                                       goto free_5b_1;
+                       /*
+                        * skb_shinfo(skb)->frag_list will have L4
+                        * data payload
+                        */
+                       skb_shinfo(*skb)->frag_list =
+                               dev_alloc_skb(MODE5_BUF_SIZE + ALIGN_SIZE);
+                       if (skb_shinfo(*skb)->frag_list == NULL) {
+                               DBG_PRINT(INFO_DBG, "%s: dev_alloc_skb \
+                               failed\n ", ring->dev->name);
+                               stats->rx_mem_alloc_fail_cnt++;
+                               goto free_5b_2;
+                       }
+                       frag_list = skb_shinfo(*skb)->frag_list;
+                       frag_list->next = NULL;
+                       (*skb)->truesize += frag_list->truesize;
+                       stats->rx_mem_allocated += frag_list->truesize;
+                       /*
+                        * Buffer-2 receives L4 data payload
+                        */
+                       rxdp5->Buffer2_ptr = *temp2 =
+                               pci_map_single(ring->pdev, frag_list->data,
+                                       MODE5_BUF_SIZE, PCI_DMA_FROMDEVICE);
+                       if ((rxdp5->Buffer2_ptr == 0) ||
+                               (rxdp5->Buffer2_ptr == DMA_ERROR_CODE))
+                                       goto free_5b_2;
+
+                       if (ring->skbs_per_rxd > 2) {
+                               /*
+                                * frag_list->next will have L4
+                                * data payload
+                                */
+                               frag_list->next =
+                                       dev_alloc_skb(MODE5_BUF_SIZE +
+                                               ALIGN_SIZE);
+                               if (frag_list->next == NULL) {
+                                       DBG_PRINT(ERR_DBG, "%s: dev_alloc_skb \
+                                               failed\n ", ring->dev->name);
+                                       stats->rx_mem_alloc_fail_cnt++;
+                                       goto free_5b_3;
+                               }
+
+                               frag_list = frag_list->next;
+                               frag_list->next = NULL;
+                               (*skb)->truesize += frag_list->truesize;
+                               stats->rx_mem_allocated += frag_list->truesize;
+
+                               /*
+                                * Buffer-3 receives L4 data payload
+                                */
+                               rxdp5->Buffer3_ptr = *temp3 =
+                                       pci_map_single(ring->pdev,
+                                               frag_list->data, MODE5_BUF_SIZE,
+                                               PCI_DMA_FROMDEVICE);
+                               if ((rxdp5->Buffer3_ptr == 0) ||
+                                   (rxdp5->Buffer3_ptr == DMA_ERROR_CODE)) {
+                                               frag_list =
+                                                   skb_shinfo(*skb)->frag_list;
+                                               goto free_5b_3;
+                               }
+                       } else
+                               rxdp5->Buffer3_ptr = *temp3 =
+                                       rxdp5->Buffer2_ptr;
+
+                       if (ring->skbs_per_rxd > 3) {
+                               frag_list->next = dev_alloc_skb(MODE5_BUF_SIZE +
+                                                               ALIGN_SIZE);
+                               if (skb_shinfo(*skb)->frag_list == NULL) {
+                                       DBG_PRINT(INFO_DBG, "%s: dev_alloc_skb \
+                                       failed\n ", ring->dev->name);
+                                       stats->rx_mem_alloc_fail_cnt++;
+                                       frag_list = skb_shinfo(*skb)->frag_list;
+                                       goto free_5b_4;
+                               }
+                               frag_list->next = NULL;
+                               (*skb)->truesize += frag_list->truesize;
+                               stats->rx_mem_allocated +=
+                                       frag_list->truesize;
+
+                               /* Get physical address for buffer 4 */
+                               rxdp5->Buffer4_ptr = *temp4 =
+                                       pci_map_single(ring->pdev,
+                                               frag_list->data,
+                                               MODE5_BUF_SIZE,
+                                               PCI_DMA_FROMDEVICE);
+                               if ((rxdp5->Buffer4_ptr == 0) ||
+                                       (rxdp5->Buffer4_ptr ==
+                                               DMA_ERROR_CODE)) {
+                                               frag_list =
+                                                 skb_shinfo(*skb)->frag_list;
+                                               goto free_5b_4;
+                               }
+                       } else
+                               rxdp5->Buffer4_ptr = *temp4 =
+                                       rxdp5->Buffer3_ptr;
+
+                       rxdp5->Host_Control = rxd_index;
+                       ring->skbs[rxd_index] =
+                               (unsigned long) (*skb);
+                       break;
+
+free_5b_4:
+               stats->rx_pci_map_fail_cnt++;
+               pci_unmap_single(ring->pdev,
+                       (dma_addr_t)(unsigned long)frag_list->next->data,
+                       MODE5_BUF_SIZE, PCI_DMA_FROMDEVICE);
+free_5b_3:
+               stats->rx_pci_map_fail_cnt++;
+               pci_unmap_single(ring->pdev,
+                       (dma_addr_t)(unsigned long)frag_list->data,
+                       MODE5_BUF_SIZE, PCI_DMA_FROMDEVICE);
+free_5b_2:
+               stats->rx_pci_map_fail_cnt++;
+               pci_unmap_single(ring->pdev,
+                       (dma_addr_t)(unsigned long)(*skb)->data,
+                       l3l4hdr_size + 4, PCI_DMA_FROMDEVICE);
+free_5b_1:
+               stats->rx_pci_map_fail_cnt++;
+               pci_unmap_single(ring->pdev,
+                       (dma_addr_t)(unsigned long)ba->ba_0,
+                       BUF0_LEN, PCI_DMA_FROMDEVICE);
+free_5b_0:
+               stats->rx_pci_map_fail_cnt++;
+               stats->rx_mem_freed += (*skb)->truesize;
+               dev_kfree_skb(*skb);
+               return -ENOMEM;
+               }
+       break;
+
+       case RXD_MODE_3B: /* Two buffer Mode */
+               rxdp3 = (struct RxD3 *)rxdp;
                if (*skb) {
                        rxdp3->Buffer2_ptr = *temp2;
                        rxdp3->Buffer0_ptr = *temp0;
@@ -6894,80 +9042,114 @@ static int set_rxd_buffer_pointer(struct s2io_nic *sp, struct RxD_t *rxdp,
                } else {
                        *skb = dev_alloc_skb(size);
                        if (!(*skb)) {
-                               DBG_PRINT(INFO_DBG, "%s: Out of ", dev->name);
+                               DBG_PRINT(INFO_DBG, "%s: Out of ",
+                                       ring->dev->name);
                                DBG_PRINT(INFO_DBG, "memory to allocate ");
                                DBG_PRINT(INFO_DBG, "2 buf mode SKBs\n");
-                               sp->mac_control.stats_info->sw_stat. \
-                                       mem_alloc_fail_cnt++;
-                               return -ENOMEM;
+                               stats->rx_mem_alloc_fail_cnt++;
+                               return -ENOMEM ;
                        }
-                       sp->mac_control.stats_info->sw_stat.mem_allocated
-                               += (*skb)->truesize;
-                       rxdp3->Buffer2_ptr = *temp2 =
-                               pci_map_single(sp->pdev, (*skb)->data,
-                                              dev->mtu + 4,
-                                              PCI_DMA_FROMDEVICE);
-                       if (pci_dma_mapping_error(sp->pdev, rxdp3->Buffer2_ptr))
-                               goto memalloc_failed;
+
                        rxdp3->Buffer0_ptr = *temp0 =
-                               pci_map_single( sp->pdev, ba->ba_0, BUF0_LEN,
-                                               PCI_DMA_FROMDEVICE);
-                       if (pci_dma_mapping_error(sp->pdev,
-                                               rxdp3->Buffer0_ptr)) {
-                               pci_unmap_single (sp->pdev,
-                                       (dma_addr_t)rxdp3->Buffer2_ptr,
-                                       dev->mtu + 4, PCI_DMA_FROMDEVICE);
-                               goto memalloc_failed;
-                       }
-                       rxdp->Host_Control = (unsigned long) (*skb);
+                               pci_map_single(ring->pdev, ba->ba_0, BUF0_LEN,
+                               PCI_DMA_FROMDEVICE);
+                       if ((rxdp3->Buffer0_ptr == 0) ||
+                               (rxdp3->Buffer0_ptr == DMA_ERROR_CODE))
+                                       goto free_3b_0;
 
                        /* Buffer-1 will be dummy buffer not used */
                        rxdp3->Buffer1_ptr = *temp1 =
-                               pci_map_single(sp->pdev, ba->ba_1, BUF1_LEN,
-                                               PCI_DMA_FROMDEVICE);
-                       if (pci_dma_mapping_error(sp->pdev,
-                                               rxdp3->Buffer1_ptr)) {
-                               pci_unmap_single (sp->pdev,
-                                       (dma_addr_t)rxdp3->Buffer0_ptr,
-                                       BUF0_LEN, PCI_DMA_FROMDEVICE);
-                               pci_unmap_single (sp->pdev,
-                                       (dma_addr_t)rxdp3->Buffer2_ptr,
-                                       dev->mtu + 4, PCI_DMA_FROMDEVICE);
-                               goto memalloc_failed;
-                       }
+                               pci_map_single(ring->pdev, ba->ba_1, BUF1_LEN,
+                               PCI_DMA_FROMDEVICE);
+                       if ((rxdp3->Buffer1_ptr == 0) ||
+                               (rxdp3->Buffer1_ptr == DMA_ERROR_CODE))
+                                       goto free_3b_1;
+
+                       stats->rx_mem_allocated += (*skb)->truesize;
+                       rxdp3->Buffer2_ptr = *temp2 =
+                               pci_map_single(ring->pdev, (*skb)->data,
+                               size - BUF0_LEN,
+                               PCI_DMA_FROMDEVICE);
+                       if ((rxdp3->Buffer2_ptr == 0) ||
+                               (rxdp3->Buffer2_ptr == DMA_ERROR_CODE))
+                                       goto free_3b_2;
+
+                       rxdp->Host_Control = (unsigned long) (*skb);
+                       break;
+
+free_3b_2:
+               stats->rx_pci_map_fail_cnt++;
+               pci_unmap_single(ring->pdev,
+                       (dma_addr_t)(unsigned long)ba->ba_1,
+                       BUF1_LEN, PCI_DMA_FROMDEVICE);
+free_3b_1:
+               stats->rx_pci_map_fail_cnt++;
+               pci_unmap_single(ring->pdev,
+                       (dma_addr_t)(unsigned long)ba->ba_0,
+                       BUF0_LEN, PCI_DMA_FROMDEVICE);
+free_3b_0:
+               stats->rx_pci_map_fail_cnt++;
+               stats->rx_mem_freed += (*skb)->truesize;
+               dev_kfree_skb(*skb);
+               return -ENOMEM;
                }
+       break;
        }
        return 0;
-       memalloc_failed:
-               stats->pci_map_fail_cnt++;
-               stats->mem_freed += (*skb)->truesize;
-               dev_kfree_skb(*skb);
-               return -ENOMEM;
 }
 
-static void set_rxd_buffer_size(struct s2io_nic *sp, struct RxD_t *rxdp,
-                               int size)
+static void set_rxd_buffer_size(struct ring_info *ring, struct RxD_t *rxdp,
+               int size)
 {
-       struct net_device *dev = sp->dev;
-       if (sp->rxd_mode == RXD_MODE_1) {
+       struct RxD5 *rxdp5;
+
+       switch (ring->rxd_mode) {
+       case RXD_MODE_1:
                rxdp->Control_2 = SET_BUFFER0_SIZE_1( size - NET_IP_ALIGN);
-       } else if (sp->rxd_mode == RXD_MODE_3B) {
+               break;
+
+       case RXD_MODE_5:
+               rxdp5 = (struct RxD5 *)rxdp;
+               rxdp->Control_2 &= (~MASK_BUFFER0_SIZE_5);
+               rxdp->Control_2 |= SET_BUFFER0_SIZE_5(BUF0_LEN);
+               rxdp->Control_2 &= (~MASK_BUFFER1_SIZE_5);
+               rxdp->Control_2 |= SET_BUFFER1_SIZE_5(l3l4hdr_size + 4);
+               rxdp->Control_2 &= (~MASK_BUFFER2_SIZE_5);
+               rxdp->Control_2 |= SET_BUFFER2_SIZE_5(MODE5_BUF_SIZE);
+               rxdp5->Control_3        &= (~MASK_BUFFER3_SIZE_5);
+               if (ring->skbs_per_rxd > 2)
+                       rxdp5->Control_3 |=
+                               SET_BUFFER3_SIZE_5(MODE5_BUF_SIZE);
+               else
+                       rxdp5->Control_3 |= SET_BUFFER3_SIZE_5(1);
+               rxdp5->Control_3        &= (~MASK_BUFFER4_SIZE_5);
+               if (ring->skbs_per_rxd > 3)
+                       rxdp5->Control_3 |=
+                               SET_BUFFER4_SIZE_5(MODE5_BUF_SIZE);
+               else
+                       rxdp5->Control_3 |= SET_BUFFER4_SIZE_5(1);
+               break;
+
+       case RXD_MODE_3B:
                rxdp->Control_2 = SET_BUFFER0_SIZE_3(BUF0_LEN);
                rxdp->Control_2 |= SET_BUFFER1_SIZE_3(1);
-               rxdp->Control_2 |= SET_BUFFER2_SIZE_3( dev->mtu + 4);
+               rxdp->Control_2 |= SET_BUFFER2_SIZE_3(size - BUF0_LEN);
+               break;
        }
 }
 
 static  int rxd_owner_bit_reset(struct s2io_nic *sp)
 {
        int i, j, k, blk_cnt = 0, size;
-       struct mac_info * mac_control = &sp->mac_control;
+       struct mac_info *mac_control = &sp->mac_control;
        struct config_param *config = &sp->config;
        struct net_device *dev = sp->dev;
        struct RxD_t *rxdp = NULL;
        struct sk_buff *skb = NULL;
        struct buffAdd *ba = NULL;
        u64 temp0_64 = 0, temp1_64 = 0, temp2_64 = 0;
+       u64 temp3_64 = 0, temp4_64 = 0;
+       int     rxd_index = 0;
 
        /* Calculate the size based on ring mode */
        size = dev->mtu + HEADER_ETHERNET_II_802_3_SIZE +
@@ -6976,6 +9158,8 @@ static  int rxd_owner_bit_reset(struct s2io_nic *sp)
                size += NET_IP_ALIGN;
        else if (sp->rxd_mode == RXD_MODE_3B)
                size = dev->mtu + ALIGN_SIZE + BUF0_LEN + 4;
+       else
+               size = l3l4hdr_size + ALIGN_SIZE + BUF0_LEN + 4;
 
        for (i = 0; i < config->rx_ring_num; i++) {
                blk_cnt = config->rx_cfg[i].num_rxd /
@@ -6985,17 +9169,26 @@ static  int rxd_owner_bit_reset(struct s2io_nic *sp)
                        for (k = 0; k < rxd_count[sp->rxd_mode]; k++) {
                                rxdp = mac_control->rings[i].
                                        rx_blocks[j].rxds[k].virt_addr;
-                               if(sp->rxd_mode == RXD_MODE_3B)
+
+                               rxd_index = k + 1;
+                               if (j)
+                                       rxd_index +=
+                                               (j * rxd_count[sp->rxd_mode]);
+
+                               if (sp->rxd_mode >= RXD_MODE_3B)
                                        ba = &mac_control->rings[i].ba[j][k];
-                               if (set_rxd_buffer_pointer(sp, rxdp, ba,
-                                                      &skb,(u64 *)&temp0_64,
-                                                      (u64 *)&temp1_64,
-                                                      (u64 *)&temp2_64,
-                                                       size) == -ENOMEM) {
+                               if (set_rxd_buffer_pointer
+                                               (&mac_control->rings[i], rxdp,
+                                               ba, &skb, (u64 *)&temp0_64,
+                                               (u64 *)&temp1_64,
+                                               (u64 *)&temp2_64,
+                                               (u64 *)&temp3_64,
+                                               (u64 *)&temp4_64,
+                                               size, rxd_index) == -ENOMEM)
                                        return 0;
-                               }
 
-                               set_rxd_buffer_size(sp, rxdp, size);
+                               set_rxd_buffer_size(&mac_control->rings[i],
+                                       rxdp, size);
                                wmb();
                                /* flip the Ownership bit to Hardware */
                                rxdp->Control_1 |= RXD_OWN_XENA;
@@ -7006,20 +9199,22 @@ static  int rxd_owner_bit_reset(struct s2io_nic *sp)
 
 }
 
-static int s2io_add_isr(struct s2io_nic * sp)
+static int s2io_add_isr(struct s2io_nic *sp)
 {
-       int ret = 0;
        struct net_device *dev = sp->dev;
        int err = 0;
 
+#ifdef CONFIG_PCI_MSI
+       int ret = 0;
        if (sp->config.intr_type == MSI_X)
                ret = s2io_enable_msi_x(sp);
+
        if (ret) {
                DBG_PRINT(ERR_DBG, "%s: Defaulting to INTA\n", dev->name);
                sp->config.intr_type = INTA;
        }
 
-       /* Store the values of the MSIX table in the struct s2io_nic structure */
+       /* Store the values of the MSIX table in the s2io_nic structure */
        store_xmsi_data(sp);
 
        /* After proper initialization of H/W, register ISR */
@@ -7027,22 +9222,20 @@ static int s2io_add_isr(struct s2io_nic * sp)
                int i, msix_rx_cnt = 0;
 
                for (i = 0; i < sp->num_entries; i++) {
-                       if (sp->s2io_entries[i].in_use == MSIX_FLG) {
+                       if(sp->s2io_entries[i].in_use == MSIX_FLG) {
                                if (sp->s2io_entries[i].type ==
                                        MSIX_RING_TYPE) {
                                        sprintf(sp->desc[i], "%s:MSI-X-%d-RX",
                                                dev->name, i);
                                        err = request_irq(sp->entries[i].vector,
-                                               s2io_msix_ring_handle, 0,
-                                               sp->desc[i],
+                                               s2io_msix_ring_handle, 0, sp->desc[i],
                                                sp->s2io_entries[i].arg);
                                } else if (sp->s2io_entries[i].type ==
                                        MSIX_ALARM_TYPE) {
                                        sprintf(sp->desc[i], "%s:MSI-X-%d-TX",
                                        dev->name, i);
                                        err = request_irq(sp->entries[i].vector,
-                                               s2io_msix_fifo_handle, 0,
-                                               sp->desc[i],
+                                               s2io_msix_fifo_handle, 0, sp->desc[i],
                                                sp->s2io_entries[i].arg);
 
                                }
@@ -7050,16 +9243,16 @@ static int s2io_add_isr(struct s2io_nic * sp)
                                if (!(sp->msix_info[i].addr &&
                                        sp->msix_info[i].data)) {
                                        DBG_PRINT(ERR_DBG,
-                                               "%s @Addr:0x%llx Data:0x%llx\n",
-                                               sp->desc[i],
-                                               (unsigned long long)
+                                       "%s @ Addr:0x%llx Data:0x%llx\n",
+                                       sp->desc[i],
+                                       (unsigned long long)
                                                sp->msix_info[i].addr,
-                                               (unsigned long long)
+                                       (unsigned long long)
                                                ntohl(sp->msix_info[i].data));
                                } else
                                        msix_rx_cnt++;
                                if (err) {
-                                       remove_msix_isr(sp);
+                                       do_rem_msix_isr(sp);
 
                                        DBG_PRINT(ERR_DBG,
                                                "%s:MSI-X-%d registration "
@@ -7076,14 +9269,16 @@ static int s2io_add_isr(struct s2io_nic * sp)
                        }
                }
                if (!err) {
-                       printk(KERN_INFO "MSI-X-RX %d entries enabled\n",
-                               --msix_rx_cnt);
+                       DBG_PRINT(INFO_DBG, "MSI-X-RX %d entries enabled\n",
+                                 --msix_rx_cnt);
                        DBG_PRINT(INFO_DBG, "MSI-X-TX entries enabled"
                                                " through alarm vector\n");
                }
        }
+#endif
        if (sp->config.intr_type == INTA) {
-               err = request_irq((int) sp->pdev->irq, s2io_isr, IRQF_SHARED,
+               err = request_irq((int) sp->pdev->irq,
+                               s2io_isr, IRQF_SHARED,
                                sp->name, dev);
                if (err) {
                        DBG_PRINT(ERR_DBG, "%s: ISR registration failed\n",
@@ -7093,54 +9288,62 @@ static int s2io_add_isr(struct s2io_nic * sp)
        }
        return 0;
 }
-static void s2io_rem_isr(struct s2io_nic * sp)
+
+static void s2io_rem_isr(struct s2io_nic *sp)
 {
+#ifdef CONFIG_PCI_MSI
        if (sp->config.intr_type == MSI_X)
-               remove_msix_isr(sp);
+               do_rem_msix_isr(sp);
        else
-               remove_inta_isr(sp);
+#endif
+       do_rem_inta_isr(sp);
 }
 
-static void do_s2io_card_down(struct s2io_nic * sp, int do_io)
+static void do_s2io_card_down(struct s2io_nic *sp, int do_io)
 {
-       int cnt = 0;
+       int cnt;
+       u64 tmp64;
        struct XENA_dev_config __iomem *bar0 = sp->bar0;
        register u64 val64 = 0;
-       struct config_param *config;
-       config = &sp->config;
+       struct config_param *config = &sp->config;
 
        if (!is_s2io_card_up(sp))
                return;
 
        del_timer_sync(&sp->alarm_timer);
-       /* If s2io_set_link task is executing, wait till it completes. */
-       while (test_and_set_bit(__S2IO_STATE_LINK_TASK, &(sp->state))) {
+
+       /* If s2io_set_link task/restart task is executing,
+        * wait till it completes. */
+       while (test_and_set_bit(__S2IO_STATE_LINK_RESET_TASK, &(sp->state)))
                msleep(50);
-       }
+
        clear_bit(__S2IO_STATE_CARD_UP, &sp->state);
 
        /* Disable napi */
-       if (sp->config.napi) {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
+       if (config->napi) {
                int off = 0;
-               if (config->intr_type ==  MSI_X) {
-                       for (; off < sp->config.rx_ring_num; off++)
-                               napi_disable(&sp->mac_control.rings[off].napi);
-                       }
-               else
-                       napi_disable(&sp->napi);
+               for (; off < config->rx_ring_num; off++)
+                       napi_disable(&sp->mac_control.rings[off].napi);
        }
+#endif
 
-       /* disable Tx and Rx traffic on the NIC */
-       if (do_io)
-               stop_nic(sp);
+       /* delete all populated mac entries */
+       for (cnt = 1; cnt < config->max_mc_addr; cnt++) {
+               tmp64 = do_s2io_read_unicast_mc(sp, cnt);
+               if (tmp64 != S2IO_DISABLE_MAC_ENTRY)
+                       do_s2io_delete_unicast_mc(sp, tmp64);
+       }
 
-       s2io_rem_isr(sp);
+       /* disable Tx and Rx traffic on the NIC */
+       if (do_io)
+               stop_nic(sp);
 
-       /* stop the tx queue, indicate link down */
-       s2io_link(sp, LINK_DOWN);
+       s2io_rem_isr(sp);
 
+       cnt = 0;
        /* Check if the device is Quiescent and then Reset the NIC */
-       while(do_io) {
+       while (do_io) {
                /* As per the HW requirement we need to replenish the
                 * receive buffer to avoid the ring bump. Since there is
                 * no intention of processing the Rx frame at this pointwe are
@@ -7152,20 +9355,21 @@ static void do_s2io_card_down(struct s2io_nic * sp, int do_io)
 
                val64 = readq(&bar0->adapter_status);
                if (verify_xena_quiescence(sp)) {
-                       if(verify_pcc_quiescent(sp, sp->device_enabled_once))
-                       break;
+                       if (verify_pcc_quiescent(sp, sp->device_enabled_once))
+                               break;
                }
 
                msleep(50);
                cnt++;
                if (cnt == 10) {
                        DBG_PRINT(ERR_DBG,
-                                 "s2io_close:Device not Quiescent ");
+                                 "%s:Device not Quiescent ", __FUNCTION__);
                        DBG_PRINT(ERR_DBG, "adaper status reads 0x%llx\n",
-                                 (unsigned long long) val64);
+                               (unsigned long long) val64);
                        break;
                }
        }
+
        if (do_io)
                s2io_reset(sp);
 
@@ -7175,27 +9379,28 @@ static void do_s2io_card_down(struct s2io_nic * sp, int do_io)
        /* Free all Rx buffers */
        free_rx_buffers(sp);
 
-       clear_bit(__S2IO_STATE_LINK_TASK, &(sp->state));
+       clear_bit(__S2IO_STATE_LINK_RESET_TASK, &(sp->state));
 }
 
-static void s2io_card_down(struct s2io_nic * sp)
+static void s2io_card_down(struct s2io_nic *sp)
 {
        do_s2io_card_down(sp, 1);
 }
 
-static int s2io_card_up(struct s2io_nic * sp)
+static int s2io_card_up(struct s2io_nic *sp)
 {
        int i, ret = 0;
        struct mac_info *mac_control;
        struct config_param *config;
        struct net_device *dev = (struct net_device *) sp->dev;
+       struct ring_info *ring;
        u16 interruptible;
 
        /* Initialize the H/W I/O registers */
        ret = init_nic(sp);
        if (ret != 0) {
                DBG_PRINT(ERR_DBG, "%s: H/W initialization failed\n",
-                         dev->name);
+                       dev->name);
                if (ret != -EIO)
                        s2io_reset(sp);
                return ret;
@@ -7208,37 +9413,50 @@ static int s2io_card_up(struct s2io_nic * sp)
        mac_control = &sp->mac_control;
        config = &sp->config;
 
+
        for (i = 0; i < config->rx_ring_num; i++) {
-               mac_control->rings[i].mtu = dev->mtu;
-               ret = fill_rx_buffers(sp, &mac_control->rings[i], 1);
+               ring = &mac_control->rings[i];
+               ring->skbs_per_rxd = 1;
+               if (ring->rxd_mode == RXD_MODE_5) {
+                       if (dev->mtu <= MODE5_BUF_SIZE)
+                               /* l3l4 Header + Payload */
+                               ring->skbs_per_rxd = 2;
+                       else
+                               if (dev->mtu <= (2 * MODE5_BUF_SIZE))
+                                       /* Header+2*Payload */
+                                       ring->skbs_per_rxd = 3;
+                               else
+                                       /* Header+3*Payload */
+                                       ring->skbs_per_rxd = 4;
+               }
+               ring->mtu = dev->mtu;
+               ret = fill_rx_buffers(ring);
                if (ret) {
-                       DBG_PRINT(ERR_DBG, "%s: Out of memory in Open\n",
-                                 dev->name);
+                       DBG_PRINT(ERR_DBG, "%s - %s: Out of memory in Open\n",
+                               __FUNCTION__, dev->name);
                        s2io_reset(sp);
                        free_rx_buffers(sp);
                        return -ENOMEM;
                }
                DBG_PRINT(INFO_DBG, "Buf in ring:%d is %d:\n", i,
-                         mac_control->rings[i].rx_bufs_left);
+                       ring->rx_bufs_left);
        }
 
        /* Initialise napi */
-       if (config->napi) {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
+       if (sp->config.napi) {
                int i;
-               if (config->intr_type ==  MSI_X) {
-                       for (i = 0; i < sp->config.rx_ring_num; i++)
-                               napi_enable(&sp->mac_control.rings[i].napi);
-               } else {
-                       napi_enable(&sp->napi);
-               }
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       napi_enable(&sp->mac_control.rings[i].napi);
        }
+#endif
 
        /* Maintain the state prior to the open */
        if (sp->promisc_flg)
                sp->promisc_flg = 0;
        if (sp->m_cast_flg) {
                sp->m_cast_flg = 0;
-               sp->all_multi_pos= 0;
+               sp->all_multi_pos = 0;
        }
 
        /* Setting its receive mode */
@@ -7246,10 +9464,18 @@ static int s2io_card_up(struct s2io_nic * sp)
 
        if (sp->lro) {
                /* Initialize max aggregatable pkts per session based on MTU */
-               sp->lro_max_aggr_per_sess = ((1<<16) - 1) / dev->mtu;
-               /* Check if we can use(if specified) user provided value */
-               if (lro_max_pkts < sp->lro_max_aggr_per_sess)
-                       sp->lro_max_aggr_per_sess = lro_max_pkts;
+               sp->lro_max_aggr_per_sess = (lro_max_bytes - 1) / dev->mtu;
+
+               if (sp->lro_max_aggr_per_sess < MIN_LRO_PACKETS)
+                       sp->lro_max_aggr_per_sess = MIN_LRO_PACKETS;
+
+               if (sp->lro_max_aggr_per_sess > MAX_LRO_PACKETS)
+                       sp->lro_max_aggr_per_sess = MAX_LRO_PACKETS;
+
+               for (i = 0; i < sp->config.rx_ring_num; i++) {
+                       ring = &mac_control->rings[i];
+                       ring->lro_max_aggr_per_sess = sp->lro_max_aggr_per_sess;
+               }
        }
 
        /* Enable Rx Traffic and interrupts on the NIC */
@@ -7262,8 +9488,6 @@ static int s2io_card_up(struct s2io_nic * sp)
 
        /* Add interrupt service routine */
        if (s2io_add_isr(sp) != 0) {
-               if (sp->config.intr_type == MSI_X)
-                       s2io_rem_isr(sp);
                s2io_reset(sp);
                free_rx_buffers(sp);
                return -ENODEV;
@@ -7271,19 +9495,17 @@ static int s2io_card_up(struct s2io_nic * sp)
 
        S2IO_TIMER_CONF(sp->alarm_timer, s2io_alarm_handle, sp, (HZ/2));
 
-       set_bit(__S2IO_STATE_CARD_UP, &sp->state);
-
        /*  Enable select interrupts */
        en_dis_err_alarms(sp, ENA_ALL_INTRS, ENABLE_INTRS);
        if (sp->config.intr_type != INTA) {
-               interruptible = TX_TRAFFIC_INTR | TX_PIC_INTR;
-               en_dis_able_nic_intrs(sp, interruptible, ENABLE_INTRS);
+               en_dis_able_nic_intrs(sp, TX_TRAFFIC_INTR, ENABLE_INTRS);
        } else {
                interruptible = TX_TRAFFIC_INTR | RX_TRAFFIC_INTR;
                interruptible |= TX_PIC_INTR;
                en_dis_able_nic_intrs(sp, interruptible, ENABLE_INTRS);
        }
 
+       set_bit(__S2IO_STATE_CARD_UP, &sp->state);
        return 0;
 }
 
@@ -7297,26 +9519,31 @@ static int s2io_card_up(struct s2io_nic * sp)
  * spin lock.
  */
 
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19))
+static void s2io_restart_nic(unsigned long data)
+{
+       struct net_device *dev = (struct net_device *) data;
+       struct s2io_nic *sp = dev->priv;
+#else
 static void s2io_restart_nic(struct work_struct *work)
 {
-       struct s2io_nic *sp = container_of(work, struct s2io_nic, rst_timer_task);
+       struct s2io_nic *sp = container_of(work, struct s2io_nic,
+               rst_timer_task);
        struct net_device *dev = sp->dev;
-
-       rtnl_lock();
+#endif
+       int ret = 0;
 
        if (!netif_running(dev))
-               goto out_unlock;
+               return;
+
+       ret = s2io_restart_card(sp);
+       if(ret)
+               return;
 
-       s2io_card_down(sp);
-       if (s2io_card_up(sp)) {
-               DBG_PRINT(ERR_DBG, "%s: Device bring up failed\n",
-                         dev->name);
-       }
        s2io_wake_all_tx_queue(sp);
+
        DBG_PRINT(ERR_DBG, "%s: was reset by Tx watchdog timer\n",
                  dev->name);
-out_unlock:
-       rtnl_unlock();
 }
 
 /**
@@ -7335,13 +9562,83 @@ out_unlock:
 static void s2io_tx_watchdog(struct net_device *dev)
 {
        struct s2io_nic *sp = dev->priv;
-
+       /* Donot reset in debug mode */
        if (netif_carrier_ok(dev)) {
-               sp->mac_control.stats_info->sw_stat.watchdog_timer_cnt++;
-               schedule_work(&sp->rst_timer_task);
-               sp->mac_control.stats_info->sw_stat.soft_reset_cnt++;
+               sp->mac_stat_info->watchdog_timer_cnt++;
+               if (sp->exec_mode) {
+                       schedule_work(&sp->rst_timer_task);
+                       sp->mac_stat_info->soft_reset_cnt++;
+               }
+       }
+}
+
+#ifdef RX_ERR_DBG
+void dump_packet(struct ring_info *ring, struct sk_buff *skb,
+       struct RxD_t *rxdp)
+{
+       int len = 0, buf0_len = 0, buf1_len = 0, frag_len = 0, i = 0, j;
+       struct sk_buff *frag_list = skb_shinfo(skb)->frag_list;
+       u8 *ptr = skb->data;
+       u8 *frag_ptr = frag_list->data;
+       struct RxD5 *rxdptr;
+
+       if (!skb->len) {
+               if (ring->rxd_mode == RXD_MODE_1) {
+                       len = RXD_GET_BUFFER0_SIZE_1(rxdp->Control_2);
+               } else if (ring->rxd_mode == RXD_MODE_5) {
+                       rxdptr = (struct RxD5 *)rxdp;
+                       buf0_len = RXD_GET_BUFFER0_SIZE_5(rxdp->Control_2);
+                       buf1_len = RXD_GET_BUFFER1_SIZE_5(rxdp->Control_2);
+                       frag_len = RXD_GET_BUFFER2_SIZE_5(rxdp->Control_2);
+                       if (ring->skbs_per_rxd > 2)
+                               frag_len += RXD_GET_BUFFER3_SIZE_5
+                                       (rxdptr->Control_3);
+                       if (ring->skbs_per_rxd > 3)
+                               frag_len += RXD_GET_BUFFER4_SIZE_5
+                                       (rxdptr->Control_3);
+                       len = buf0_len + buf1_len + frag_len;
+               } else if (ring->rxd_mode == RXD_MODE_3B) {
+                       buf0_len = RXD_GET_BUFFER0_SIZE_3(rxdp->Control_2);
+                       len = buf0_len +
+                               RXD_GET_BUFFER2_SIZE_3(rxdp->Control_2);
+               }
+
+               DBG_PRINT(ERR_DBG, "Packet contents : Length = %d\n", len);
+
+               if (ring->rxd_mode >= RXD_MODE_3B) {
+                       int get_block = ring->rx_curr_get_info.block_index;
+                       int get_off = ring->rx_curr_get_info.offset;
+                       struct buffAdd *ba = &ring->ba[get_block][get_off];
+                       for (i = 0; i < buf0_len; i += 2) {
+                               DBG_PRINT(ERR_DBG, "%02x%02x  ",
+                                       *(u8 *)(ba->ba_0 + i),
+                                       *(u8 *)(ba->ba_0 + i + 1));
+                               if (!((i + 2) % 16))
+                                       DBG_PRINT(ERR_DBG, "\n");
+                       }
+               }
+       } else {
+               len = skb->len;
+               frag_len = frag_list->len;
+               DBG_PRINT(ERR_DBG, "Packet contents : Length = %d\n", len);
+       }
+       for (j = 0; j < (len - buf0_len - frag_len); j += 2, i += 2) {
+               DBG_PRINT(ERR_DBG, "%02x%02x  ", *(ptr + j), *(ptr + j + 1));
+               if (!((i + 2) % 16))
+                       DBG_PRINT(ERR_DBG, "\n");
+       }
+
+       if (ring->rxd_mode == RXD_MODE_5) {
+               for (j = 0; j < frag_len; j += 2, i += 2) {
+                       DBG_PRINT(ERR_DBG, "%02x%02x  ", *(frag_ptr + j),
+                               *(frag_ptr + j + 1));
+                       if (!((i + 2) % 16))
+                               DBG_PRINT(ERR_DBG, "\n");
+               }
        }
+       DBG_PRINT(ERR_DBG, "\n\n");
 }
+#endif
 
 /**
  *   rx_osm_handler - To perform some OS related operations on SKB.
@@ -7360,72 +9657,78 @@ static void s2io_tx_watchdog(struct net_device *dev)
  *   Return value:
  *   SUCCESS on success and -1 on failure.
  */
-static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
-{
-       struct s2io_nic *sp = ring_data->nic;
-       struct net_device *dev = (struct net_device *) ring_data->dev;
-       struct sk_buff *skb = (struct sk_buff *)
-               ((unsigned long) rxdp->Host_Control);
-       int ring_no = ring_data->ring_no;
-       u16 l3_csum, l4_csum;
-       unsigned long long err = rxdp->Control_1 & RXD_T_CODE;
-       struct lro *lro;
-       u8 err_mask;
+static int rx_osm_handler(struct ring_info *ring, struct RxD_t *rxdp)
+{
+       struct net_device *dev = (struct net_device *) ring->dev;
+       struct sk_buff *skb = NULL;
+       u16 vlan_tag;
+       u16 vlan_id = 0;
+       int verify_vlan_registered = 0;
+       u8 err = rxdp->Control_1 & RXD_T_CODE;
+       struct lro *lro = NULL;
+       struct rxRingStat *ring_stats = ring->rx_ring_stat;
+       struct swLROStat *lro_stats = &ring->rx_ring_stat->sw_lro_stat;
+
+       if (ring->rxd_mode == RXD_MODE_5)
+               skb = (struct sk_buff *) \
+                               ((unsigned long)ring->skbs[((unsigned long) \
+                                       ((struct RxD5 *)rxdp)->Host_Control)]);
+       else
+               skb = (struct sk_buff *) ((unsigned long)rxdp->Host_Control);
 
+#ifdef virt_addr_valid
+       if (!virt_addr_valid(skb)) {
+               DBG_PRINT(INFO_DBG, "%s: not valid SKB: %p\n",
+                       dev->name, skb);
+               return 0;
+       }
+#endif
        skb->dev = dev;
-
+       err = GET_RXD_T_CODE(rxdp->Control_1);
        if (err) {
-               /* Check for parity error */
-               if (err & 0x1) {
-                       sp->mac_control.stats_info->sw_stat.parity_err_cnt++;
-               }
-               err_mask = err >> 48;
-               switch(err_mask) {
-                       case 1:
-                               sp->mac_control.stats_info->sw_stat.
-                               rx_parity_err_cnt++;
+               switch (err) {
+               case 1:
+                       ring->rx_ring_stat->rx_parity_err_cnt++;
                        break;
 
-                       case 2:
-                               sp->mac_control.stats_info->sw_stat.
-                               rx_abort_cnt++;
+               case 2:
+                       ring->rx_ring_stat->rx_abort_cnt++;
                        break;
 
-                       case 3:
-                               sp->mac_control.stats_info->sw_stat.
-                               rx_parity_abort_cnt++;
+               case 3:
+                       ring->rx_ring_stat->rx_parity_abort_cnt++;
                        break;
 
-                       case 4:
-                               sp->mac_control.stats_info->sw_stat.
-                               rx_rda_fail_cnt++;
+               case 4:
+                        ring->rx_ring_stat->rx_rda_fail_cnt++;
                        break;
 
-                       case 5:
-                               sp->mac_control.stats_info->sw_stat.
-                               rx_unkn_prot_cnt++;
+               case 5:
+                       ring->rx_ring_stat->rx_unkn_prot_cnt++;
                        break;
 
-                       case 6:
-                               sp->mac_control.stats_info->sw_stat.
-                               rx_fcs_err_cnt++;
+               case 6:
+                       ring->rx_ring_stat->rx_fcs_err_cnt++;
                        break;
 
-                       case 7:
-                               sp->mac_control.stats_info->sw_stat.
-                               rx_buf_size_err_cnt++;
+               case 7:
+                       ring->rx_ring_stat->rx_buf_size_err_cnt++;
                        break;
 
-                       case 8:
-                               sp->mac_control.stats_info->sw_stat.
-                               rx_rxd_corrupt_cnt++;
+               case 8:
+                       ring->rx_ring_stat->rx_rxd_corrupt_cnt++;
                        break;
 
-                       case 15:
-                               sp->mac_control.stats_info->sw_stat.
-                               rx_unkn_err_cnt++;
+               case 15:
+                       ring->rx_ring_stat->rx_unkn_err_cnt++;
                        break;
                }
+
+#ifdef RX_ERR_DBG
+               DBG_PRINT(ERR_DBG, "%s: Rx error Value: 0x%x\n",
+                       dev->name, err);
+               dump_packet(ring, skb, rxdp);
+#endif
                /*
                * Drop the packet if bad transfer code. Exception being
                * 0x5, which could be due to unsupported IPv6 extension header.
@@ -7433,104 +9736,180 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                * Note that in this case, since checksum will be incorrect,
                * stack will validate the same.
                */
-               if (err_mask != 0x5) {
-                       DBG_PRINT(ERR_DBG, "%s: Rx error Value: 0x%x\n",
-                               dev->name, err_mask);
-                       dev->stats.rx_crc_errors++;
-                       sp->mac_control.stats_info->sw_stat.mem_freed
-                               += skb->truesize;
+               if (err != 0x5) {
+                       DBG_PRINT(INFO_DBG, "%s: Rx error Value: 0x%x\n",
+                               dev->name, err);
+                       ring->nic->stats.rx_crc_errors++;
+                       ring_stats->rx_mem_freed += skb->truesize;
+                       dev_kfree_skb(skb);
+                       ring->rx_bufs_left -= 1;
+                       rxdp->Host_Control = 0;
+                       return 0;
+               }
+       }
+#ifdef RX_ERR_DBG
+       else if (ring->nic->ecc_flag) {
+               DBG_PRINT(ERR_DBG, "%s: ECC error encountered\n",
+                       dev->name);
+               dump_packet(ring, skb, rxdp);
+       }
+#endif
+
+       vlan_tag = RXD_GET_VLAN_TAG(rxdp->Control_2);
+
+       /* Check the packet for correct registered vlan id*/
+       if ((ring->ring_no == 0) &&
+               (ring->rx_steering_type == RX_VLAN_STEERING))
+               verify_vlan_registered = 1;
+
+       if (verify_vlan_registered || ring->lro){
+               /* Is the frame VLAN tagged? */
+               if (rxdp->Control_1 & RXD_FRAME_VLAN_TAG)
+                       /* Get the vlan id */
+                       vlan_id = VLAN_VID_MASK & vlan_tag;
+               if (!vlan_id)
+                       verify_vlan_registered = 0;
+       }
+
+       if (verify_vlan_registered) {
+               /* Is it registered */
+               if ((vlan_id >= VLAN_VID_MASK) ||
+                       (S2IO_INVALID_RING ==
+                       ring->nic->vlan_array[vlan_id])) {
+                       DBG_PRINT(INFO_DBG, "%s: Drop the unregistered"
+                               " vlan packet with VID = %d\n",
+                               dev->name, vlan_id);
+                       ring_stats->rx_mem_freed += skb->truesize;
                        dev_kfree_skb(skb);
-                       ring_data->rx_bufs_left -= 1;
+                       ring->rx_bufs_left -= 1;
                        rxdp->Host_Control = 0;
                        return 0;
                }
        }
 
        /* Updating statistics */
-       ring_data->rx_packets++;
-       rxdp->Host_Control = 0;
-       if (sp->rxd_mode == RXD_MODE_1) {
-               int len = RXD_GET_BUFFER0_SIZE_1(rxdp->Control_2);
+       if (ring->rxd_mode == RXD_MODE_5)
+               ((struct RxD5 *)rxdp)->Host_Control = 0;
+       else
+               rxdp->Host_Control = 0;
 
-               ring_data->rx_bytes += len;
+       ring->rx_packets++;
+       if (ring->rxd_mode == RXD_MODE_1) {
+               int len = RXD_GET_BUFFER0_SIZE_1(rxdp->Control_2);
+               ring->rx_bytes += len;
                skb_put(skb, len);
-
-       } else if (sp->rxd_mode == RXD_MODE_3B) {
-               int get_block = ring_data->rx_curr_get_info.block_index;
-               int get_off = ring_data->rx_curr_get_info.offset;
+       } else if (ring->rxd_mode == RXD_MODE_5) {
+               int get_block = ring->rx_curr_get_info.block_index;
+               int get_off = ring->rx_curr_get_info.offset;
+               int buf0_len = RXD_GET_BUFFER0_SIZE_5(rxdp->Control_2);
+               int buf1_len = RXD_GET_BUFFER1_SIZE_5(rxdp->Control_2);
+               int buf2_len = RXD_GET_BUFFER2_SIZE_5(rxdp->Control_2);
+               int buf3_len =
+                   RXD_GET_BUFFER3_SIZE_5(((struct RxD5 *)rxdp)->Control_3);
+               int buf4_len =
+                   RXD_GET_BUFFER4_SIZE_5(((struct RxD5 *)rxdp)->Control_3);
+               unsigned char *buff = skb_push(skb, buf0_len);
+               struct buffAdd *ba = &ring->ba[get_block][get_off];
+               struct sk_buff *frag_list = NULL;
+
+               COPY_ETH_HDR(buf0_len, buff, ba);
+
+               ring->rx_bytes += buf0_len + buf1_len + buf2_len +
+                               buf3_len + buf4_len;
+
+               skb_put(skb, buf1_len);
+               skb->len += buf2_len;
+               skb->data_len += buf2_len;
+               frag_list = skb_shinfo(skb)->frag_list;
+               skb_put(frag_list, buf2_len);
+               if (ring->skbs_per_rxd > 2) {
+                       skb->len += buf3_len;
+                       skb->data_len += buf3_len;
+                       skb_put(frag_list->next, buf3_len);
+               }
+               if (ring->skbs_per_rxd > 3) {
+                       skb->len += buf4_len;
+                       skb->data_len += buf4_len;
+                       frag_list = frag_list->next;
+                       skb_put(frag_list->next, buf4_len);
+               }
+       } else if (ring->rxd_mode >= RXD_MODE_3B) {
+               int get_block = ring->rx_curr_get_info.block_index;
+               int get_off = ring->rx_curr_get_info.offset;
                int buf0_len = RXD_GET_BUFFER0_SIZE_3(rxdp->Control_2);
                int buf2_len = RXD_GET_BUFFER2_SIZE_3(rxdp->Control_2);
                unsigned char *buff = skb_push(skb, buf0_len);
 
-               struct buffAdd *ba = &ring_data->ba[get_block][get_off];
-               ring_data->rx_bytes += buf0_len + buf2_len;
-               memcpy(buff, ba->ba_0, buf0_len);
+               struct buffAdd *ba = &ring->ba[get_block][get_off];
+               ring->rx_bytes += buf0_len + buf2_len;
+
+               COPY_ETH_HDR(buf0_len, buff, ba);
+
                skb_put(skb, buf2_len);
        }
 
-       if ((rxdp->Control_1 & TCP_OR_UDP_FRAME) && ((!ring_data->lro) ||
-           (ring_data->lro && (!(rxdp->Control_1 & RXD_FRAME_IP_FRAG)))) &&
-           (sp->rx_csum)) {
-               l3_csum = RXD_GET_L3_CKSUM(rxdp->Control_1);
-               l4_csum = RXD_GET_L4_CKSUM(rxdp->Control_1);
-               if ((l3_csum == L3_CKSUM_OK) && (l4_csum == L4_CKSUM_OK)) {
-                       /*
-                        * NIC verifies if the Checksum of the received
-                        * frame is Ok or not and accordingly returns
-                        * a flag in the RxD.
-                        */
+       if ((rxdp->Control_1 & RXD_TCP_OR_UDP_FRAME) && ((!ring->lro) ||
+               (ring->lro && (!(rxdp->Control_1 & RXD_FRAME_IP_FRAG)))) &&
+               (ring->rx_csum)) {
+               if ((RXD_GET_L3_CKSUM(rxdp->Control_1) == L3_CKSUM_OK) &&
+                       (RXD_GET_L4_CKSUM(rxdp->Control_1) == L4_CKSUM_OK)) {
                        skb->ip_summed = CHECKSUM_UNNECESSARY;
-                       if (ring_data->lro) {
-                               u32 tcp_len;
+                       if (ring->lro && ((rxdp->Control_1 &
+                               RXD_TCP_IPV4_FRAME) == RXD_TCP_IPV4_FRAME)) {
+                               u32 tcp_len = 0;
                                u8 *tcp;
                                int ret = 0;
 
-                               ret = s2io_club_tcp_session(ring_data,
-                                       skb->data, &tcp, &tcp_len, &lro,
-                                       rxdp, sp);
-                               switch (ret) {
-                                       case 3: /* Begin anew */
-                                               lro->parent = skb;
-                                               goto aggregate;
-                                       case 1: /* Aggregate */
-                                       {
-                                               lro_append_pkt(sp, lro,
-                                                       skb, tcp_len);
-                                               goto aggregate;
-                                       }
-                                       case 4: /* Flush session */
-                                       {
-                                               lro_append_pkt(sp, lro,
-                                                       skb, tcp_len);
-                                               queue_rx_frame(lro->parent,
-                                                       lro->vlan_tag);
-                                               clear_lro_session(lro);
-                                               sp->mac_control.stats_info->
-                                                   sw_stat.flush_max_pkts++;
-                                               goto aggregate;
+                               ret = s2io_club_tcp_session(ring, skb->data,
+                                       &tcp, &tcp_len, &lro, rxdp, vlan_id);
+
+                               if (lro && (lro->sg_num > ring->max_pkts_aggr)){
+                                       lro->vlan_tag = vlan_tag;
+                                       ring->max_pkts_aggr = lro->sg_num;
+                               }
+
+                               if (LRO_AGGR_PACKET == ret) {
+                                       lro_append_pkt(ring, lro, skb, tcp_len,
+                                               ring->aggr_ack);
+                                       goto aggregate;
+                               } else if (LRO_BEG_AGGR == ret) {
+                                       lro->parent = skb;
+                                       if (ring->rxd_mode == RXD_MODE_5) {
+                                               struct sk_buff *frag_list =
+                                                   skb_shinfo(skb)->frag_list;
+                                               if (frag_list) {
+                                                       /* Traverse to the end
+                                                       * of the list*/
+                                                       while (frag_list->next)
+                                                         frag_list =
+                                                           frag_list->next;
+                                                       lro->last_frag =
+                                                               frag_list;
+                                                       lro->frags_len =
+                                                               skb->data_len;
+                                               }
                                        }
-                                       case 2: /* Flush both */
-                                               lro->parent->data_len =
-                                                       lro->frags_len;
-                                               sp->mac_control.stats_info->
-                                                    sw_stat.sending_both++;
-                                               queue_rx_frame(lro->parent,
-                                                       lro->vlan_tag);
-                                               clear_lro_session(lro);
-                                               goto send_up;
-                                       case 0: /* sessions exceeded */
-                                       case -1: /* non-TCP or not
-                                                 * L2 aggregatable
-                                                 */
-                                       case 5: /*
-                                                * First pkt in session not
-                                                * L3/L4 aggregatable
-                                                */
-                                               break;
-                                       default:
-                                               DBG_PRINT(ERR_DBG,
-                                                       "%s: Samadhana!!\n",
-                                                        __FUNCTION__);
+                                       goto aggregate;
+                               } else if (LRO_FLUSH_SESSION == ret) {
+                                       lro_append_pkt(ring, lro, skb, tcp_len,
+                                               ring->aggr_ack);
+                                       queue_rx_frame(lro->parent,
+                                               ring, lro->vlan_tag);
+                                       clear_lro_session(lro);
+                                       lro_stats->flush_max_pkts++;
+                                       goto aggregate;
+                               } else if (LRO_FLUSH_BOTH == ret) {
+                                       lro->parent->data_len = lro->frags_len;
+                                       lro_stats->sending_both++;
+                                       queue_rx_frame(lro->parent,
+                                               ring, lro->vlan_tag);
+                                       clear_lro_session(lro);
+                                       goto send_up;
+                               } else if ((0 != ret) && (-1 != ret) &&
+                                               (5 != ret)) {
+                                               DBG_PRINT(INFO_DBG,
+                                                "%s:Tcp Session Unhandled\n",
+                                                       __FUNCTION__);
                                                BUG();
                                }
                        }
@@ -7540,16 +9919,23 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
                         * upper layers deal with it.
                         */
                        skb->ip_summed = CHECKSUM_NONE;
+#ifdef RX_ERR_DBG
+                       DBG_PRINT(ERR_DBG, "%s: Checksum error\n",
+                               dev->name);
+                       dump_packet(ring, skb, rxdp);
+#endif
                }
-       } else
+       } else {
                skb->ip_summed = CHECKSUM_NONE;
+       }
+
+       ring_stats->rx_mem_freed += skb->truesize;
 
-       sp->mac_control.stats_info->sw_stat.mem_freed += skb->truesize;
 send_up:
-       queue_rx_frame(skb, RXD_GET_VLAN_TAG(rxdp->Control_2));
+       queue_rx_frame(skb, ring, vlan_tag);
        dev->last_rx = jiffies;
 aggregate:
-       sp->mac_control.rings[ring_no].rx_bufs_left -= 1;
+       ring->rx_bufs_left -= 1;
        return SUCCESS;
 }
 
@@ -7566,26 +9952,28 @@ aggregate:
  *  void.
  */
 
-static void s2io_link(struct s2io_nic * sp, int link)
+static void s2io_link(struct s2io_nic *sp, int link)
 {
        struct net_device *dev = (struct net_device *) sp->dev;
+       struct swDbgStat *stats = sp->sw_dbg_stat;
 
        if (link != sp->last_link_state) {
                init_tti(sp, link);
                if (link == LINK_DOWN) {
                        DBG_PRINT(ERR_DBG, "%s: Link down\n", dev->name);
                        s2io_stop_all_tx_queue(sp);
+
                        netif_carrier_off(dev);
-                       if(sp->mac_control.stats_info->sw_stat.link_up_cnt)
-                       sp->mac_control.stats_info->sw_stat.link_up_time =
-                               jiffies - sp->start_time;
-                       sp->mac_control.stats_info->sw_stat.link_down_cnt++;
+                       if (stats->link_up_cnt)
+                               stats->link_up_time = jiffies - sp->start_time;
+                       stats->link_down_cnt++;
                } else {
                        DBG_PRINT(ERR_DBG, "%s: Link Up\n", dev->name);
-                       if (sp->mac_control.stats_info->sw_stat.link_down_cnt)
-                       sp->mac_control.stats_info->sw_stat.link_down_time =
-                               jiffies - sp->start_time;
-                       sp->mac_control.stats_info->sw_stat.link_up_cnt++;
+
+                       if (stats->link_down_cnt)
+                               stats->link_down_time =
+                                       jiffies - sp->start_time;
+                       stats->link_up_cnt++;
                        netif_carrier_on(dev);
                        s2io_wake_all_tx_queue(sp);
                }
@@ -7594,24 +9982,86 @@ static void s2io_link(struct s2io_nic * sp, int link)
        sp->start_time = jiffies;
 }
 
+/**
+ *  get_xena_rev_id - to identify revision ID of xena.
+ *  @pdev : PCI Dev structure
+ *  Description:
+ *  Function to identify the Revision ID of xena.
+ *  Return value:
+ *  returns the revision ID of the device.
+ */
+
+static int get_xena_rev_id(struct pci_dev *pdev)
+{
+       u8 id = 0;
+       pci_read_config_byte(pdev, PCI_REVISION_ID, (u8 *) &id);
+       return id;
+}
+
+/* Returns 1 if system has AMD 8131a or Broadcom HT 1000 chipset.
+* Returns 0 otherwise
+*/
+static int check_for_pcix_safe_param(void)
+{
+       struct pci_dev *tdev = NULL;
+       u8 id = 0, set_param = 0;
+
+       if ((tdev = S2IO_PCI_FIND_DEVICE(0x1022, 0x7450, NULL))!= NULL) {
+               S2IO_PCI_PUT_DEVICE(tdev);
+               pci_read_config_byte(tdev, PCI_REVISION_ID, (u8 *) &id);
+               if (id <= 0x12) {
+                       DBG_PRINT(INIT_DBG, "Found AMD 8131a bridge\n");
+                       set_param = 1;
+               }
+       }
+
+       if ((tdev = S2IO_PCI_FIND_DEVICE(0x1166, 0x0104, NULL)) != NULL) {
+               S2IO_PCI_PUT_DEVICE(tdev);
+               DBG_PRINT(INIT_DBG, "Found Broadcom HT 1000 bridge\n");
+               set_param = 1;
+       }
+       return set_param;
+}
+
+static u8 update_8132_hyper_transport;
+static void amd_8132_update_hyper_tx(u8 set_reset)
+{
+       struct pci_dev *tdev = NULL;
+       u8 id = 0, ret;
+
+       while ((tdev = S2IO_PCI_FIND_DEVICE(PCI_VENDOR_ID_AMD,
+               PCI_DEVICE_ID_AMD_8132_BRIDGE, tdev)) !=  NULL) {
+               ret = pci_read_config_byte(tdev, 0xf6, (u8 *) &id);
+               if (set_reset & S2IO_BIT_SET) {
+                       if (id != 1) {
+                               ret = pci_write_config_byte(tdev, 0xf6, 1);
+                               update_8132_hyper_transport = 1;
+                       }
+               } else {
+                       if (update_8132_hyper_transport && (id == 1))
+                               ret = pci_write_config_byte(tdev, 0xf6, 0);
+               }
+       }
+}
+
 /**
  *  s2io_init_pci -Initialization of PCI and PCI-X configuration registers .
  *  @sp : private member of the device structure, which is a pointer to the
  *  s2io_nic structure.
  *  Description:
- *  This function initializes a few of the PCI and PCI-X configuration registers
- *  with recommended values.
+ *  This function initializes a few of the PCI and PCI-X configuration
+ *  registers with recommended values.
  *  Return value:
  *  void
  */
 
-static void s2io_init_pci(struct s2io_nic * sp)
+static void s2io_init_pci(struct s2io_nic *sp)
 {
        u16 pci_cmd = 0, pcix_cmd = 0;
 
        /* Enable Data Parity Error Recovery in PCI-X command register. */
        pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER,
-                            &(pcix_cmd));
+               &(pcix_cmd));
        pci_write_config_word(sp->pdev, PCIX_COMMAND_REGISTER,
                              (pcix_cmd | 1));
        pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER,
@@ -7622,112 +10072,414 @@ static void s2io_init_pci(struct s2io_nic * sp)
        pci_write_config_word(sp->pdev, PCI_COMMAND,
                              (pci_cmd | PCI_COMMAND_PARITY));
        pci_read_config_word(sp->pdev, PCI_COMMAND, &pci_cmd);
+
+       /*
+        * If system has AMD 8131a(rev12 and below) OR
+        * Broadcom HT 1000 bridge, set safe PCI-X
+        * parameters(MMRBC=1K and max splits = 2)
+        */
+       if (check_for_pcix_safe_param()) {
+               pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER,
+                       &(pcix_cmd));
+               pcix_cmd &= ~(0x7c);
+               pcix_cmd |= 0x14;
+               pci_write_config_word(sp->pdev, PCIX_COMMAND_REGISTER,
+                       pcix_cmd);
+               DBG_PRINT(INIT_DBG, "Found AMD 8131a bridge\n");
+       }
 }
 
-static int s2io_verify_parm(struct pci_dev *pdev, u8 *dev_intr_type,
-       u8 *dev_multiq)
+static void print_static_param_list(struct net_device *dev)
 {
-       if ((tx_fifo_num > MAX_TX_FIFOS) ||
-               (tx_fifo_num < 1)) {
-               DBG_PRINT(ERR_DBG, "s2io: Requested number of tx fifos "
-                       "(%d) not supported\n", tx_fifo_num);
+       struct s2io_nic *sp = dev->priv;
 
-               if (tx_fifo_num < 1)
-                       tx_fifo_num = 1;
-               else
-                       tx_fifo_num = MAX_TX_FIFOS;
+       DBG_PRINT(ERR_DBG, "%s: Using %d Tx fifo(s)\n", dev->name,
+                 sp->config.tx_fifo_num);
 
-               DBG_PRINT(ERR_DBG, "s2io: Default to %d ", tx_fifo_num);
-               DBG_PRINT(ERR_DBG, "tx fifos\n");
-       }
+       DBG_PRINT(ERR_DBG, "%s: Using %d Rx ring(s)\n", dev->name,
+                 sp->config.rx_ring_num);
 
-       if (multiq)
-               *dev_multiq = multiq;
+       DBG_PRINT(ERR_DBG, "%s: %d-Buffer receive mode enabled\n",
+               dev->name, rx_ring_mode);
 
-       if (tx_steering_type && (1 == tx_fifo_num)) {
-               if (tx_steering_type != TX_DEFAULT_STEERING)
-                       DBG_PRINT(ERR_DBG,
-                               "s2io: Tx steering is not supported with "
-                               "one fifo. Disabling Tx steering.\n");
-               tx_steering_type = NO_STEERING;
-       }
+       if (lro_enable == S2IO_DONT_AGGR_FWD_PKTS) {
+               DBG_PRINT(ERR_DBG, "%s: Large receive offload enabled\n",
+                       dev->name);
+       } else if (lro_enable == S2IO_ALWAYS_AGGREGATE) {
+               DBG_PRINT(ERR_DBG, "%s: Large receive offload enabled "
+                       "for all packets\n", dev->name);
+       } else
+               DBG_PRINT(ERR_DBG, "%s: Large receive offload disabled\n",
+                       dev->name);
 
-       if ((tx_steering_type < NO_STEERING) ||
-               (tx_steering_type > TX_DEFAULT_STEERING)) {
-               DBG_PRINT(ERR_DBG, "s2io: Requested transmit steering not "
-                        "supported\n");
-               DBG_PRINT(ERR_DBG, "s2io: Disabling transmit steering\n");
-               tx_steering_type = NO_STEERING;
-       }
+       if (vlan_tag_strip == S2IO_STRIP_VLAN_TAG) {
+               DBG_PRINT(ERR_DBG, "%s: Vlan tag stripping enabled\n",
+                       dev->name);
+       } else if (vlan_tag_strip == S2IO_DO_NOT_STRIP_VLAN_TAG)
+               DBG_PRINT(ERR_DBG, "%s: Vlan tag stripping disabled\n",
+                       dev->name);
+       if (ufo) {
+               if (sp->device_type != XFRAME_II_DEVICE) {
+                       DBG_PRINT(ERR_DBG, "%s: Xframe I does not support UDP "
+                               "Fragmentation Offload(UFO)\n", dev->name);
+               } else
+                       DBG_PRINT(ERR_DBG, "%s: UDP Fragmentation Offload(UFO)"
+                               " enabled\n", dev->name);
+       } else
+               DBG_PRINT(ERR_DBG, "%s: UDP Fragmentation Offload(UFO) "
+                       "disabled\n", dev->name);
 
-       if (rx_ring_num > MAX_RX_RINGS) {
-               DBG_PRINT(ERR_DBG, "s2io: Requested number of rx rings not "
-                        "supported\n");
-               DBG_PRINT(ERR_DBG, "s2io: Default to %d rx rings\n",
-                       MAX_RX_RINGS);
-               rx_ring_num = MAX_RX_RINGS;
-       }
+       if (sp->config.multiq) {
+               DBG_PRINT(ERR_DBG, "%s: Multiqueue support enabled\n",
+                       dev->name);
+       } else
+               DBG_PRINT(ERR_DBG, "%s: Multiqueue support disabled\n",
+                       dev->name);
 
-       if ((*dev_intr_type != INTA) && (*dev_intr_type != MSI_X)) {
-               DBG_PRINT(ERR_DBG, "s2io: Wrong intr_type requested. "
-                         "Defaulting to INTA\n");
-               *dev_intr_type = INTA;
+       if (dev->mtu == 1500)
+               DBG_PRINT(ERR_DBG, "%s: MTU size is %d\n",
+                       dev->name, dev->mtu);
+
+       switch (sp->config.intr_type) {
+       case INTA:
+               DBG_PRINT(ERR_DBG, "%s: Interrupt type INTA\n", dev->name);
+               break;
+       case MSI_X:
+               DBG_PRINT(ERR_DBG, "%s: Interrupt type MSI-X\n", dev->name);
+               break;
        }
 
-       if ((*dev_intr_type == MSI_X) &&
-                       ((pdev->device != PCI_DEVICE_ID_HERC_WIN) &&
-                       (pdev->device != PCI_DEVICE_ID_HERC_UNI))) {
-               DBG_PRINT(ERR_DBG, "s2io: Xframe I does not support MSI_X. "
-                                       "Defaulting to INTA\n");
-               *dev_intr_type = INTA;
+       switch (sp->config.tx_steering_type) {
+               case TX_PRIORITY_STEERING:
+                       DBG_PRINT(ERR_DBG, "%s: Priority steering enabled for "
+                                               "transmit\n", dev->name);
+                       break;
+               case TX_VLAN_STEERING:
+                       DBG_PRINT(ERR_DBG, "%s: VLAN steering enabled for "
+                                               "transmit\n", dev->name);
+                       break;
        }
 
-       if ((rx_ring_mode != 1) && (rx_ring_mode != 2)) {
-               DBG_PRINT(ERR_DBG, "s2io: Requested ring mode not supported\n");
-               DBG_PRINT(ERR_DBG, "s2io: Defaulting to 1-buffer mode\n");
-               rx_ring_mode = 1;
+       switch (sp->config.rx_steering_type) {
+               case RX_TOS_STEERING:
+                       DBG_PRINT(ERR_DBG, "%s: TOS steering enabled "
+                                       "for receive\n", dev->name);
+                       break;
+               case RX_VLAN_STEERING:
+                       DBG_PRINT(ERR_DBG, "%s: VLAN steering enabled for "
+                                               "receive\n", dev->name);
+                       break;
+               case PORT_STEERING:
+                       DBG_PRINT(ERR_DBG, "%s: PORT steering enabled\n",
+                                       dev->name);
+                       break;
        }
-       return SUCCESS;
-}
 
-/**
- * rts_ds_steer - Receive traffic steering based on IPv4 or IPv6 TOS
- * or Traffic class respectively.
- * @nic: device private variable
- * Description: The function configures the receive steering to
- * desired receive ring.
- * Return Value:  SUCCESS on success and
- * '-1' on failure (endian settings incorrect).
- */
-static int rts_ds_steer(struct s2io_nic *nic, u8 ds_codepoint, u8 ring)
-{
-       struct XENA_dev_config __iomem *bar0 = nic->bar0;
-       register u64 val64 = 0;
+       if (sp->config.rx_steering_type == RTH_STEERING) {
+               switch (rth_protocol) {
+               case 1:
+               case 2:
+                       if (1 == rth_protocol) {
+                               DBG_PRINT(ERR_DBG, "%s: " \
+                                       "RTH steering enabled for TCP_IPV4\n",
+                                       dev->name);
+                       } else {
+                               DBG_PRINT(ERR_DBG, "%s: " \
+                                       "RTH steering enabled for UDP_IPV4\n",
+                                       dev->name);
+                       }
 
-       if (ds_codepoint > 63)
-               return FAILURE;
+                       if ((rth_mask & S2IO_RTS_RTH_MASK_IPV6_SRC) ||
+                               (rth_mask & S2IO_RTS_RTH_MASK_IPV6_DST)) {
+                               DBG_PRINT(ERR_DBG, "RTH Mask is not correct. "
+                                       "Disabling mask.\n");
+                               rth_mask = 0;
+                       }
 
-       val64 = RTS_DS_MEM_DATA(ring);
-       writeq(val64, &bar0->rts_ds_mem_data);
+                       break;
 
-       val64 = RTS_DS_MEM_CTRL_WE |
-               RTS_DS_MEM_CTRL_STROBE_NEW_CMD |
-               RTS_DS_MEM_CTRL_OFFSET(ds_codepoint);
+               case 3:
+                       DBG_PRINT(ERR_DBG,
+                               "%s: RTH steering enabled for IPV4 \n",
+                               dev->name);
+                       if ((rth_mask & S2IO_RTS_RTH_MASK_IPV6_SRC) ||
+                               (rth_mask & S2IO_RTS_RTH_MASK_IPV6_DST) ||
+                               (rth_mask & S2IO_RTS_RTH_MASK_L4_SRC) ||
+                               (rth_mask & S2IO_RTS_RTH_MASK_L4_DST)) {
+                               DBG_PRINT(ERR_DBG, "RTH Mask is not correct. "
+                                       "Disabling mask.\n");
+                               rth_mask = 0;
+                       }
+                       break;
 
-       writeq(val64, &bar0->rts_ds_mem_ctrl);
+               case 4:
+               case 5:
+                       if (4 == rth_protocol) {
+                               DBG_PRINT(ERR_DBG,
+                                       "%s: RTH steering enabled for "  \
+                                       "TCP_IPV6 \n", dev->name);
+                       } else {
+                               DBG_PRINT(ERR_DBG,
+                                       "%s: RTH steering enabled for " \
+                                       "UDP_IPV6 \n", dev->name);
+                       }
 
-       return wait_for_cmd_complete(&bar0->rts_ds_mem_ctrl,
-                               RTS_DS_MEM_CTRL_STROBE_CMD_BEING_EXECUTED,
-                               S2IO_BIT_RESET);
-}
+                       if ((rth_mask & S2IO_RTS_RTH_MASK_IPV4_SRC) ||
+                               (rth_mask & S2IO_RTS_RTH_MASK_IPV4_DST)) {
+                               DBG_PRINT(ERR_DBG, "RTH Mask is not correct. "
+                                       "Disabling mask.\n");
+                               rth_mask = 0;
+                       }
+                       break;
 
-/**
- *  s2io_init_nic - Initialization of the adapter .
- *  @pdev : structure containing the PCI related information of the device.
- *  @pre: List of PCI devices supported by the driver listed in s2io_tbl.
- *  Description:
- *  The function initializes an adapter identified by the pci_dec structure.
- *  All OS related initialization including memory and device structure and
+               case 6:
+                       DBG_PRINT(ERR_DBG,
+                               "%s: RTH steering enabled for IPV6 \n",
+                               dev->name);
+                       if ((rth_mask & S2IO_RTS_RTH_MASK_IPV4_SRC) ||
+                               (rth_mask & S2IO_RTS_RTH_MASK_IPV4_DST) ||
+                               (rth_mask & S2IO_RTS_RTH_MASK_L4_SRC) ||
+                               (rth_mask & S2IO_RTS_RTH_MASK_L4_DST)) {
+                               DBG_PRINT(ERR_DBG, "RTH Mask is not correct. "
+                                       "Disabling mask.\n");
+                               rth_mask = 0;
+                       }
+                       break;
+
+               case 7:
+               case 8:
+               case 9:
+                       if (7 == rth_protocol) {
+                               DBG_PRINT(ERR_DBG,
+                                       "%s: RTH steering enabled for " \
+                                       "TCP_IPV6_EX \n", dev->name);
+                       } else if (8 == rth_protocol) {
+                               DBG_PRINT(ERR_DBG,
+                                       "%s: RTH steering enabled for " \
+                                       "UDP_IPV6_EX \n", dev->name);
+                       } else {
+                               DBG_PRINT(ERR_DBG,
+                                       "%s: RTH steering enabled for " \
+                                       "IPV6_EX \n", dev->name);
+                       }
+
+                       if ((rth_mask & S2IO_RTS_RTH_MASK_IPV4_SRC) ||
+                               (rth_mask & S2IO_RTS_RTH_MASK_IPV4_DST)) {
+                               DBG_PRINT(ERR_DBG, "RTH Mask is not correct. "
+                                       "Disabling mask.\n");
+                                       rth_mask = 0;
+                       }
+                       break;
+
+               default:
+                       DBG_PRINT(ERR_DBG, "%s: RTH Function is not correct. "
+                               "Defaulting to TCP_IPV4.\n", dev->name);
+                       rth_protocol =  0x1;
+                       if ((rth_mask & S2IO_RTS_RTH_MASK_IPV6_SRC) ||
+                               (rth_mask & S2IO_RTS_RTH_MASK_IPV6_DST)) {
+                               DBG_PRINT(ERR_DBG, "RTH Mask is not correct. "
+                                       "Disabling mask.\n");
+                               rth_mask = 0;
+                       }
+
+                       break;
+               }
+
+               if ((rth_mask < 0) || (rth_mask > 255)) {
+                       DBG_PRINT(ERR_DBG, "RTH Mask is not correct. "
+                               "Disabling mask.\n");
+                       rth_mask = 0;
+               }
+       }
+
+       if (sp->config.napi) {
+               DBG_PRINT(ERR_DBG, "%s: NAPI enabled\n", dev->name);
+       } else {
+               DBG_PRINT(ERR_DBG, "%s: NAPI disabled\n", dev->name);
+       }
+
+       return;
+}
+
+static void s2io_verify_parm(struct pci_dev *pdev, u8 *dev_intr_type,
+       u8 *dev_steer_type, u8 *dev_multiq)
+{
+       if (lro_enable) {
+               if (lro_enable > S2IO_DONT_AGGR_FWD_PKTS) {
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 9))
+                       DBG_PRINT(ERR_DBG, "s2io: Unsupported LRO option. "
+                               "Disabling LRO\n");
+                       lro_enable = S2IO_DONOT_AGGREGATE;
+#else
+                       DBG_PRINT(ERR_DBG,
+                               "s2io: Unsupported LRO option. Enabling LRO "
+                               "for local destination\n");
+                       lro_enable = S2IO_DONT_AGGR_FWD_PKTS;
+#endif
+               }
+       }
+
+       if (vlan_tag_strip) {
+               if (vlan_tag_strip > S2IO_DEFAULT_STRIP_MODE_VLAN_TAG) {
+                       DBG_PRINT(ERR_DBG,
+                               "s2io: Unsupported vlan tag sripping option. "
+                               "Enabling vlan tag stripping "
+                               "if vlan group present\n");
+                       vlan_tag_strip = S2IO_DEFAULT_STRIP_MODE_VLAN_TAG;
+               }
+       }
+
+       /* user didn't specify the fifo numbers */
+       if (tx_fifo_num == 0) {
+               if ( (tx_steering_type == TX_VLAN_STEERING) ||
+                       (tx_steering_type == TX_PRIORITY_STEERING))
+                       tx_fifo_num = MAX_TX_FIFOS;
+               else
+                       tx_fifo_num = FIFO_DEFAULT_NUM;
+       }
+
+       if (rx_ring_num == 0) {
+               if (rx_steering_type == RX_VLAN_STEERING)
+                       rx_ring_num = MAX_RX_RINGS;
+       }
+
+
+       if (tx_fifo_num > MAX_TX_FIFOS) {
+               DBG_PRINT(ERR_DBG, "s2io: Requested number of tx fifos "
+                       "(%d) not supported\n", tx_fifo_num);
+               tx_fifo_num = MAX_TX_FIFOS;
+
+               DBG_PRINT(ERR_DBG, "s2io: Default to %d ", tx_fifo_num);
+               DBG_PRINT(ERR_DBG, "tx fifos\n");
+       }
+
+       if (tx_steering_type && (1 == tx_fifo_num)) {
+               if (tx_steering_type != TX_STEERING_DEFAULT)
+                       DBG_PRINT(ERR_DBG,
+                               "s2io: Tx steering is not supported with "
+                               "one fifo. Disabling Tx steering.\n");
+               tx_steering_type = NO_STEERING;
+       }
+
+       if ((tx_steering_type < NO_STEERING) ||
+               (tx_steering_type > TX_STEERING_DEFAULT)) {
+               DBG_PRINT(ERR_DBG, "s2io: Requested transmit steering not "
+                        "supported\n");
+               DBG_PRINT(ERR_DBG, "s2io: Disabling transmit steering\n");
+               tx_steering_type = NO_STEERING;
+       }
+
+       if ((rx_steering_type < NO_STEERING) ||
+               (rx_steering_type > RTH_STEERING_DEFAULT)) {
+               DBG_PRINT(ERR_DBG, "s2io: Requested receive steering not "
+                        "supported\n");
+               DBG_PRINT(ERR_DBG, "s2io: Disabling receive steering\n");
+               rx_steering_type = NO_STEERING;
+       }
+
+       if (rx_steering_type && (1 == rx_ring_num)) {
+               if (rx_steering_type != RTH_STEERING_DEFAULT)
+                       DBG_PRINT(ERR_DBG,
+                               "s2io: Receive steering is not supported with "
+                               "one ring. Disabling receive steering.\n");
+               *dev_steer_type = NO_STEERING;
+       }
+
+       if (rx_steering_type) {
+               /* Check if it is a xena card */
+               if ((pdev->device != PCI_DEVICE_ID_HERC_WIN) &&
+                       (pdev->device != PCI_DEVICE_ID_HERC_UNI)) {
+                       if (rx_steering_type != RTH_STEERING_DEFAULT)
+                               DBG_PRINT(ERR_DBG,
+                                       "s2io: Receive steering disabled on Xframe I\n");
+                       *dev_steer_type = NO_STEERING;
+               }
+       }
+
+       if ((*dev_steer_type == RX_VLAN_STEERING) &&
+               (tx_steering_type == TX_VLAN_STEERING)) {
+               tx_fifo_num = rx_ring_num =
+                       (tx_fifo_num < rx_ring_num ? tx_fifo_num : rx_ring_num);
+       }
+
+       if (rx_ring_num > MAX_RX_RINGS) {
+               DBG_PRINT(ERR_DBG, "s2io: Requested number of rx rings not "
+                        "supported\n");
+               DBG_PRINT(ERR_DBG, "s2io: Default to %d rx rings\n",
+                       MAX_RX_RINGS);
+               rx_ring_num = MAX_RX_RINGS;
+       }
+
+#ifndef CONFIG_PCI_MSI
+       if (intr_type != INTA) {
+               DBG_PRINT(ERR_DBG, "s2io: This kernel does not support "
+                         "MSI-X. Defaulting to INTA\n");
+               *dev_intr_type = INTA;
+               intr_type = INTA;
+       }
+#else
+       if ((intr_type != INTA) && (intr_type != MSI_X)) {
+               DBG_PRINT(ERR_DBG, "s2io: Wrong intr_type requested. "
+                         "Defaulting to INTA\n");
+               *dev_intr_type = INTA;
+               intr_type = INTA;
+       }
+
+       if ((pdev->device != PCI_DEVICE_ID_HERC_WIN) &&
+                       (pdev->device != PCI_DEVICE_ID_HERC_UNI)) {
+               if (intr_type == MSI_X)
+                       DBG_PRINT(ERR_DBG, "s2io: Xframe I does not support "
+                               "MSI_X. Defaulting to INTA\n");
+               *dev_intr_type = INTA;
+       }
+#endif
+
+#ifndef NETIF_F_UFO
+       if (ufo) {
+               DBG_PRINT(ERR_DBG, "s2io: This kernel does not support "
+                       "UDP Fragmentation Offload(UFO)\n");
+               DBG_PRINT(ERR_DBG,
+                       "s2io: UDP Fragmentation Offload(UFO) disabled\n");
+               ufo = 0;
+       }
+#endif
+
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24))
+       if (multiq) {
+               DBG_PRINT(ERR_DBG, "s2io: Multiqueue is not supported by this driver "
+               "on this kernel\n");
+               multiq = 0;
+       }
+#endif
+       *dev_multiq = multiq;
+#endif
+
+#if defined CONFIG_PPC64
+       if (rx_ring_mode == 2) {
+               rx_ring_mode = 1;
+               DBG_PRINT(ERR_DBG, "s2io: 2 Buffer mode is not supported "
+               "on PPC64 Arch. Switching to 1-buffer mode \n");
+       }
+#endif
+
+       if ((rx_ring_mode != 1) && (rx_ring_mode != 2) &&
+               (rx_ring_mode != 5)) {
+               DBG_PRINT(ERR_DBG,
+                       "s2io: Requested ring mode not supported\n");
+               DBG_PRINT(ERR_DBG, "s2io: Defaulting to 1-buffer mode\n");
+               rx_ring_mode = 1;
+       }
+       return;
+}
+
+/**
+ *  s2io_init_nic - Initialization of the adapter .
+ *  @pdev : structure containing the PCI related information of the device.
+ *  @pre: List of PCI devices supported by the driver listed in s2io_tbl.
+ *  Description:
+ *  The function initializes an adapter identified by the pci_dec structure.
+ *  All OS related initialization including memory and device structure and
  *  initlaization of the device private variable is done. Also the swapper
  *  control register is initialized to enable read and write into the I/O
  *  registers of the device.
@@ -7739,7 +10491,7 @@ static int __devinit
 s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
 {
        struct s2io_nic *sp;
-       struct net_device *dev;
+       struct net_device *dev = NULL;
        int i, j, ret;
        int dma_flag = FALSE;
        u32 mac_up, mac_down;
@@ -7749,60 +10501,100 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
        struct mac_info *mac_control;
        struct config_param *config;
        int mode;
-       u8 dev_intr_type = intr_type;
-       u8 dev_multiq = 0;
-       DECLARE_MAC_BUF(mac);
+       u8 dev_intr_type, dev_multiq = 0;
+       u8 dev_steer_type = rx_steering_type;
+       int no_cpus = 1;
 
-       ret = s2io_verify_parm(pdev, &dev_intr_type, &dev_multiq);
-       if (ret)
-               return ret;
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 67))
+       int no_online_cpus = 0;
+#endif
+       DBG_PRINT(ERR_DBG, "Copyright(c) 2002-2007 Neterion Inc.\n");
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 67))
+       for (i = 0; i < NR_CPUS; i++) {
+               if (cpu_online_map & (1<<i))
+                       no_online_cpus++;
+               }
+       no_cpus = no_online_cpus;
+#else
+       no_cpus = num_online_cpus();
+#endif
+       if (DEF_MSI_X == intr_type) {
+               /* Don't enable MSI-X if there are less than 4 CPUs */
+               if (no_cpus < 4)
+                       intr_type = INTA;
+               else
+                       intr_type = MSI_X;
+       }
+       dev_intr_type = intr_type;
+
+       s2io_verify_parm(pdev, &dev_intr_type, &dev_steer_type, &dev_multiq);
 
-       if ((ret = pci_enable_device(pdev))) {
+       ret = pci_enable_device(pdev);
+       if (ret) {
                DBG_PRINT(ERR_DBG,
-                         "s2io_init_nic: pci_enable_device failed\n");
-               return ret;
+                       "%s: pci_enable_device failed\n", __FUNCTION__);
+               goto enable_device_failed;
        }
 
        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
-               DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 64bit DMA\n");
+               DBG_PRINT(INIT_DBG, "%s: Using 64bit DMA\n", __FUNCTION__);
                dma_flag = TRUE;
-               if (pci_set_consistent_dma_mask
-                   (pdev, DMA_64BIT_MASK)) {
-                       DBG_PRINT(ERR_DBG,
-                                 "Unable to obtain 64bit DMA for \
-                                       consistent allocations\n");
-                       pci_disable_device(pdev);
-                       return -ENOMEM;
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 00)) || \
+               defined CONFIG_IA64_SGI_SN2
+               if (pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
+                       DBG_PRINT(ERR_DBG, "%s: \
+                               Unable to obtain 64bit DMA for \
+                               consistent allocations\n", __FUNCTION__);
+                       ret = -ENOMEM;
+                       goto set_dma_mask_failed;
                }
+#endif
        } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
-               DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 32bit DMA\n");
+               DBG_PRINT(INIT_DBG, "%s: Using 32bit DMA\n", __FUNCTION__);
        } else {
-               pci_disable_device(pdev);
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto set_dma_mask_failed;
        }
-       if ((ret = pci_request_regions(pdev, s2io_driver_name))) {
-               DBG_PRINT(ERR_DBG, "%s: Request Regions failed - %x \n", __FUNCTION__, ret);
-               pci_disable_device(pdev);
-               return -ENODEV;
+
+       ret = pci_request_regions(pdev, s2io_driver_name);
+       if (ret) {
+               DBG_PRINT(ERR_DBG, "%s: Request Regions failed - %x \n",
+                        __FUNCTION__, ret);
+               ret = -ENODEV;
+               goto pci_request_regions_failed;
        }
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
        if (dev_multiq)
                dev = alloc_etherdev_mq(sizeof(struct s2io_nic), tx_fifo_num);
        else
+#endif
                dev = alloc_etherdev(sizeof(struct s2io_nic));
+
        if (dev == NULL) {
-               DBG_PRINT(ERR_DBG, "Device allocation failed\n");
-               pci_disable_device(pdev);
-               pci_release_regions(pdev);
-               return -ENODEV;
+               DBG_PRINT(ERR_DBG, "%s: Device allocation failed\n",
+                       __FUNCTION__);
+               ret = -ENODEV;
+               goto alloc_etherdev_failed;
        }
 
        pci_set_master(pdev);
        pci_set_drvdata(pdev, dev);
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23))
+       SET_MODULE_OWNER(dev);
+#endif
        SET_NETDEV_DEV(dev, &pdev->dev);
 
        /*  Private member variable initialized to s2io NIC structure */
        sp = dev->priv;
        memset(sp, 0, sizeof(struct s2io_nic));
+       /* Default execution mode is release mode*/
+       sp->exec_mode = 1;
+       sp->serious_err = 0;
+#ifdef RX_ERR_DBG
+       sp->ecc_flag = 0;
+#endif
        sp->dev = dev;
        sp->pdev = pdev;
        sp->high_dma_flag = dma_flag;
@@ -7811,9 +10603,41 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                sp->rxd_mode = RXD_MODE_1;
        if (rx_ring_mode == 2)
                sp->rxd_mode = RXD_MODE_3B;
+       if (rx_ring_mode == 5)
+               sp->rxd_mode = RXD_MODE_5;
+
+       /*
+        * Setting the device configuration parameters.
+        * Most of these parameters can be specified by the user during
+        * module insertion as they are module loadable parameters. If
+        * these parameters are not not specified during load time, they
+        * are initialized with default values.
+        */
+       mac_control = &sp->mac_control;
+       config = &sp->config;
+
+       config->napi = napi;
+       config->intr_type = dev_intr_type;
+       config->rx_steering_type = dev_steer_type;
+       config->tx_steering_type = tx_steering_type;
+       config->multiq = dev_multiq;
+       config->vlan_tag_strip = vlan_tag_strip;
+       config->tx_fifo_num = tx_fifo_num;
 
-       sp->config.intr_type = dev_intr_type;
+       sp->vlan_strip_flag = config->vlan_tag_strip;
+       if (sp->vlan_strip_flag == S2IO_DEFAULT_STRIP_MODE_VLAN_TAG)
+               sp->vlan_strip_flag = S2IO_DO_NOT_STRIP_VLAN_TAG;
 
+#ifdef SNMP_SUPPORT
+       strcpy(sp->cName, "NETERION");
+       strcpy(sp->cVersion, DRV_VERSION);
+#endif
+#ifdef TITAN_LEGACY
+       if ((pdev->device == PCI_DEVICE_ID_TITAN_WIN) ||
+               (pdev->device == PCI_DEVICE_ID_TITAN_UNI))
+               sp->device_type = TITAN_DEVICE;
+       else
+#endif
        if ((pdev->device == PCI_DEVICE_ID_HERC_WIN) ||
                (pdev->device == PCI_DEVICE_ID_HERC_UNI))
                sp->device_type = XFRAME_II_DEVICE;
@@ -7825,24 +10649,53 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
        /* Initialize some PCI/PCI-X fields of the NIC. */
        s2io_init_pci(sp);
 
-       /*
-        * Setting the device configuration parameters.
-        * Most of these parameters can be specified by the user during
-        * module insertion as they are module loadable parameters. If
-        * these parameters are not not specified during load time, they
-        * are initialized with default values.
-        */
-       mac_control = &sp->mac_control;
-       config = &sp->config;
+       /* By default, the mapping from MSI/MSI-X to hyper transport interrupts
+       is disabled on AMD 8132 bridge. Enable this to support MSI-X interrupts
+       */
+       if (MSI_X == intr_type)
+               amd_8132_update_hyper_tx(S2IO_BIT_SET);
 
-       config->napi = napi;
-       config->tx_steering_type = tx_steering_type;
+       sp->bar0 = (caddr_t) ioremap(pci_resource_start(pdev, 0),
+                                    pci_resource_len(pdev, 0));
+       if (!sp->bar0) {
+               DBG_PRINT(ERR_DBG, "%s: ", __FUNCTION__);
+               DBG_PRINT(ERR_DBG, "cannot remap io mem1\n");
+               ret = -ENOMEM;
+               goto bar0_remap_failed;
+       }
+
+       sp->bar1 = (caddr_t) ioremap(pci_resource_start(pdev, 2),
+                                       pci_resource_len(pdev, 2));
+       if (!sp->bar1) {
+               DBG_PRINT(ERR_DBG, "%s: ", __FUNCTION__);
+               DBG_PRINT(ERR_DBG, "cannot remap io mem2\n");
+               ret = -ENOMEM;
+               goto bar1_remap_failed;
+       }
+
+       dev->irq = pdev->irq;
+       dev->base_addr = (unsigned long) sp->bar0;
+
+       /* Setting swapper control on the NIC, for proper reset operation */
+       if (s2io_set_swapper(sp)) {
+               DBG_PRINT(ERR_DBG, "%s: ", __FUNCTION__);
+               DBG_PRINT(ERR_DBG, "swapper settings are wrong\n");
+               ret = -EAGAIN;
+               goto set_swap_failed;
+       }
+
+       /* Verify if the Herc works on the slot its placed into */
+       if (sp->device_type == XFRAME_II_DEVICE) {
+               mode = s2io_verify_pci_mode(sp);
+               if (mode < 0) {
+                       DBG_PRINT(ERR_DBG, "%s: ", __FUNCTION__);
+                       DBG_PRINT(ERR_DBG, " Unsupported PCI bus mode\n");
+                       ret = -EBADSLT;
+                       goto set_swap_failed;
+               }
+       }
 
        /* Tx side parameters. */
-       if (config->tx_steering_type == TX_PRIORITY_STEERING)
-               config->tx_fifo_num = MAX_TX_FIFOS;
-       else
-               config->tx_fifo_num = tx_fifo_num;
 
        /* Initialize the fifos used for tx steering */
        if (config->tx_fifo_num < 5) {
@@ -7861,7 +10714,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                sp->other_fifo_idx = sp->udp_fifo_idx + FIFO_UDP_MAX_NUM;
        }
 
-       config->multiq = dev_multiq;
        for (i = 0; i < config->tx_fifo_num; i++) {
                config->tx_cfg[i].fifo_len = tx_fifo_len[i];
                config->tx_cfg[i].fifo_priority = i;
@@ -7869,42 +10721,93 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
 
        /* mapping the QoS priority to the configured fifos */
        for (i = 0; i < MAX_TX_FIFOS; i++)
-               config->fifo_mapping[i] = fifo_map[config->tx_fifo_num - 1][i];
+               sp->fifo_mapping[i] = fifo_map[config->tx_fifo_num - 1][i];
 
        /* map the hashing selector table to the configured fifos */
        for (i = 0; i < config->tx_fifo_num; i++)
                sp->fifo_selector[i] = fifo_selector[i];
 
-
        config->tx_intr_type = TXD_INT_TYPE_UTILZ;
        for (i = 0; i < config->tx_fifo_num; i++) {
-               config->tx_cfg[i].f_no_snoop =
-                   (NO_SNOOP_TXD | NO_SNOOP_TXD_BUFFER);
                if (config->tx_cfg[i].fifo_len < 65) {
                        config->tx_intr_type = TXD_INT_TYPE_PER_LIST;
                        break;
                }
        }
-       /* + 2 because one Txd for skb->data and one Txd for UFO */
-       config->max_txds = MAX_SKB_FRAGS + 2;
+       config->max_txds = MAX_SKB_FRAGS + 1;
+#ifdef NETIF_F_UFO
+       config->max_txds++;
+#endif
 
        /* Rx side parameters. */
        config->rx_ring_num = rx_ring_num;
+
+       if (rx_ring_num == 0) {
+               if (sp->device_type == XFRAME_I_DEVICE)
+                       config->rx_ring_num = 1;
+               else if (config->intr_type == MSI_X)
+                       config->rx_ring_num =
+                               no_cpus > RTH_MIN_RING_NUM ?
+                                       no_cpus : RTH_MIN_RING_NUM;
+               else
+                       config->rx_ring_num = RTH_MIN_RING_NUM;
+       }
+
+       if (config->rx_ring_num > MAX_RX_RINGS)
+               config->rx_ring_num = MAX_RX_RINGS;
+
+#ifdef CONFIG_PCI_MSI
+       if ((sp->device_type == XFRAME_II_DEVICE) &&
+               (config->intr_type == MSI_X)) {
+               sp->num_entries = config->rx_ring_num + 1;
+               ret = s2io_enable_msi_x(sp);
+               if (!ret) {
+                       ret = s2io_test_msi(sp);
+                       /* rollback MSI-X, will re-enable during add_isr() */
+                       do_rem_msix_isr(sp);
+               }
+
+               if (ret) {
+                       DBG_PRINT(ERR_DBG,
+                               "MSI-X requested but failed to enable\n");
+                       config->intr_type = INTA;
+               }
+       }
+#endif
+
+       if ((config->intr_type == MSI_X) &&
+               (config->rx_steering_type == RTH_STEERING_DEFAULT) &&
+               (config->rx_ring_num > RTH_MIN_RING_NUM))
+                       config->rx_steering_type = RTH_STEERING;
+
+       if ((config->rx_steering_type == RX_TOS_STEERING) &&
+               (sp->device_type != XFRAME_I_DEVICE))
+               config->rx_ring_num = MAX_RX_RINGS;
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24))
+               /* NAPI doesn't work well with MSI(X) */
+               if (config->intr_type == MSI_X)
+                       if (config->napi)
+                               config->napi = 0;
+#endif
        for (i = 0; i < config->rx_ring_num; i++) {
                config->rx_cfg[i].num_rxd = rx_ring_sz[i] *
-                   (rxd_count[sp->rxd_mode] + 1);
+                       (rxd_count[sp->rxd_mode] + 1);
                config->rx_cfg[i].ring_priority = i;
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20))
+               atomic_set(&mac_control->rings[i].isr_cnt, 0);
+               atomic_set(&sp->isr_cnt, 0);
+#endif
+               mac_control->rings[i].vlan_strip_flag = sp->vlan_strip_flag;
                mac_control->rings[i].rx_bufs_left = 0;
+               mac_control->rings[i].lro = sp->lro;
                mac_control->rings[i].rxd_mode = sp->rxd_mode;
                mac_control->rings[i].rxd_count = rxd_count[sp->rxd_mode];
                mac_control->rings[i].pdev = sp->pdev;
                mac_control->rings[i].dev = sp->dev;
-       }
-
-       for (i = 0; i < rx_ring_num; i++) {
-               config->rx_cfg[i].ring_org = RING_ORG_BUFF1;
-               config->rx_cfg[i].f_no_snoop =
-                   (NO_SNOOP_RXD | NO_SNOOP_RXD_BUFFER);
+               mac_control->rings[i].config_napi = config->napi;
+               mac_control->rings[i].rx_steering_type =
+                       config->rx_steering_type;
        }
 
        /*  Setting Mac Control parameters */
@@ -7912,41 +10815,25 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
        mac_control->mc_pause_threshold_q0q3 = mc_pause_threshold_q0q3;
        mac_control->mc_pause_threshold_q4q7 = mc_pause_threshold_q4q7;
 
-
        /*  initialize the shared memory used by the NIC and the host */
-       if (init_shared_mem(sp)) {
-               DBG_PRINT(ERR_DBG, "%s: Memory allocation failed\n",
-                         dev->name);
-               ret = -ENOMEM;
-               goto mem_alloc_failed;
+       ret = init_shared_mem(sp);
+       if (ret != SUCCESS) {
+               DBG_PRINT(ERR_DBG, "%s: ", __FUNCTION__);
+               if (ret == -ENOMEM) {
+                       DBG_PRINT(ERR_DBG, "Memory allocation failed\n");
+                       goto mem_alloc_failed;
+               } else {
+                       DBG_PRINT(ERR_DBG,
+                               "Memory allocation configuration invalid\n");
+                       goto configuration_failed;
+               }
        }
 
-       sp->bar0 = ioremap(pci_resource_start(pdev, 0),
-                                    pci_resource_len(pdev, 0));
-       if (!sp->bar0) {
-               DBG_PRINT(ERR_DBG, "%s: Neterion: cannot remap io mem1\n",
-                         dev->name);
-               ret = -ENOMEM;
-               goto bar0_remap_failed;
-       }
-
-       sp->bar1 = ioremap(pci_resource_start(pdev, 2),
-                                    pci_resource_len(pdev, 2));
-       if (!sp->bar1) {
-               DBG_PRINT(ERR_DBG, "%s: Neterion: cannot remap io mem2\n",
-                         dev->name);
-               ret = -ENOMEM;
-               goto bar1_remap_failed;
-       }
-
-       dev->irq = pdev->irq;
-       dev->base_addr = (unsigned long) sp->bar0;
-
-       /* Initializing the BAR1 address as the start of the FIFO pointer. */
-       for (j = 0; j < MAX_TX_FIFOS; j++) {
-               mac_control->tx_FIFO_start[j] = (struct TxFIFO_element __iomem *)
-                   (sp->bar1 + (j * 0x00020000));
-       }
+       /* Initializing the BAR1 address as the start of the FIFO pointer. */
+       for (j = 0; j < config->tx_fifo_num; j++)
+               mac_control->tx_FIFO_start[j] =
+                       (struct TxFIFO_element __iomem *)
+                               (sp->bar1 + (j * 0x00020000));
 
        /*  Driver entry points */
        dev->open = &s2io_open;
@@ -7957,82 +10844,73 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
        dev->do_ioctl = &s2io_ioctl;
        dev->set_mac_address = &s2io_set_mac_addr;
        dev->change_mtu = &s2io_change_mtu;
-       SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
+#ifdef SET_ETHTOOL_OPS
+       SET_ETHTOOL_OPS(dev, (struct ethtool_ops *)&netdev_ethtool_ops);
+#endif
        dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+       if ((rx_steering_type == RX_VLAN_STEERING) ||
+               (tx_steering_type == TX_VLAN_STEERING))
+               dev->features |= NETIF_F_HW_VLAN_FILTER;
+
+#ifdef NETIF_F_LLTX
+       if (sp->device_type != XFRAME_I_DEVICE)
+               dev->features |= NETIF_F_LLTX;
+#endif
        dev->vlan_rx_register = s2io_vlan_rx_register;
        dev->vlan_rx_kill_vid = (void *)s2io_vlan_rx_kill_vid;
-
-       /*
-        * will use eth_mac_addr() for  dev->set_mac_address
-        * mac address will be set every time dev->open() is called
-        */
+       dev->vlan_rx_add_vid = (void *)s2io_vlan_rx_add_vid;
+#if defined(HAVE_NETDEV_POLL)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
+       for (i = 0; i < config->rx_ring_num ; i++)
+               netif_napi_add(dev, &mac_control->rings[i].napi,
+                       s2io_poll, 64);
+#else
+       dev->poll = s2io_poll;
+       dev->weight = 32;
+#endif
+#endif
 #ifdef CONFIG_NET_POLL_CONTROLLER
        dev->poll_controller = s2io_netpoll;
 #endif
 
-       dev->features |= NETIF_F_SG | NETIF_F_IP_CSUM;
+       dev->features |= NETIF_F_SG;
        if (sp->high_dma_flag == TRUE)
                dev->features |= NETIF_F_HIGHDMA;
+#ifdef NETIF_F_TSO
        dev->features |= NETIF_F_TSO;
+#endif
+#ifdef NETIF_F_TSO6
        dev->features |= NETIF_F_TSO6;
-       if ((sp->device_type & XFRAME_II_DEVICE) && (ufo))  {
+#endif
+#ifdef NETIF_F_UFO
+       if ((sp->device_type == XFRAME_II_DEVICE) && (ufo))
                dev->features |= NETIF_F_UFO;
+#endif
+       if (sp->device_type == XFRAME_II_DEVICE)
                dev->features |= NETIF_F_HW_CSUM;
-       }
+       else
+               dev->features |= NETIF_F_IP_CSUM;
+
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+       if (config->multiq)
+               dev->features |= NETIF_F_MULTI_QUEUE;
+#endif
        dev->tx_timeout = &s2io_tx_watchdog;
        dev->watchdog_timeo = WATCH_DOG_TIMEOUT;
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19))
+       INIT_WORK(&sp->rst_timer_task,
+               (void (*)(void *)) s2io_restart_nic, dev);
+       INIT_WORK(&sp->set_link_task,
+               (void (*)(void *)) s2io_set_link, sp);
+#else
        INIT_WORK(&sp->rst_timer_task, s2io_restart_nic);
        INIT_WORK(&sp->set_link_task, s2io_set_link);
+#endif
 
-       pci_save_state(sp->pdev);
-
-       /* Setting swapper control on the NIC, for proper reset operation */
-       if (s2io_set_swapper(sp)) {
-               DBG_PRINT(ERR_DBG, "%s:swapper settings are wrong\n",
-                         dev->name);
-               ret = -EAGAIN;
-               goto set_swap_failed;
-       }
-
-       /* Verify if the Herc works on the slot its placed into */
-       if (sp->device_type & XFRAME_II_DEVICE) {
-               mode = s2io_verify_pci_mode(sp);
-               if (mode < 0) {
-                       DBG_PRINT(ERR_DBG, "%s: ", __FUNCTION__);
-                       DBG_PRINT(ERR_DBG, " Unsupported PCI bus mode\n");
-                       ret = -EBADSLT;
-                       goto set_swap_failed;
-               }
-       }
-
-       if (sp->config.intr_type == MSI_X) {
-               sp->num_entries = config->rx_ring_num + 1;
-               ret = s2io_enable_msi_x(sp);
-
-               if (!ret) {
-                       ret = s2io_test_msi(sp);
-                       /* rollback MSI-X, will re-enable during add_isr() */
-                       remove_msix_isr(sp);
-               }
-               if (ret) {
-
-                       DBG_PRINT(ERR_DBG,
-                         "%s: MSI-X requested but failed to enable\n",
-                         dev->name);
-                       sp->config.intr_type = INTA;
-               }
-       }
-
-       if (config->intr_type ==  MSI_X) {
-               for (i = 0; i < config->rx_ring_num ; i++)
-                       netif_napi_add(dev, &mac_control->rings[i].napi,
-                               s2io_poll_msix, 64);
-       } else {
-               netif_napi_add(dev, &sp->napi, s2io_poll_inta, 64);
-       }
+       pci_save_state(sp->pdev, sp->config_space);
 
        /* Not needed for Herc */
-       if (sp->device_type & XFRAME_I_DEVICE) {
+       if (sp->device_type == XFRAME_I_DEVICE) {
                /*
                 * Fix for all "FFs" MAC address problems observed on
                 * Alpha platforms
@@ -8050,7 +10928,8 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
            RMAC_ADDR_CMD_MEM_OFFSET(0 + S2IO_MAC_ADDR_START_OFFSET);
        writeq(val64, &bar0->rmac_addr_cmd_mem);
        wait_for_cmd_complete(&bar0->rmac_addr_cmd_mem,
-                     RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING, S2IO_BIT_RESET);
+               RMAC_ADDR_CMD_MEM_STROBE_CMD_EXECUTING,
+               S2IO_BIT_RESET);
        tmp64 = readq(&bar0->rmac_addr_data0_mem);
        mac_down = (u32) tmp64;
        mac_up = (u32) (tmp64 >> 32);
@@ -8061,11 +10940,12 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
        sp->def_mac_addr[0].mac_addr[0] = (u8) (mac_up >> 24);
        sp->def_mac_addr[0].mac_addr[5] = (u8) (mac_down >> 16);
        sp->def_mac_addr[0].mac_addr[4] = (u8) (mac_down >> 24);
-
        /*  Set the factory defined MAC address initially   */
        dev->addr_len = ETH_ALEN;
        memcpy(dev->dev_addr, sp->def_mac_addr, ETH_ALEN);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 14))
        memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
+#endif
 
        /* initialize number of multicast & unicast MAC entries variables */
        if (sp->device_type == XFRAME_I_DEVICE) {
@@ -8081,25 +10961,31 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
        /* store mac addresses from CAM to s2io_nic structure */
        do_s2io_store_unicast_mc(sp);
 
-       /* Configure MSIX vector for number of rings configured plus one */
+#ifdef CONFIG_PCI_MSI
        if ((sp->device_type == XFRAME_II_DEVICE) &&
                (config->intr_type == MSI_X))
                sp->num_entries = config->rx_ring_num + 1;
+               /* Store the values of the MSIX table in the
+                * s2io_nic structure
+                */
+               store_xmsi_data(sp);
+#endif
 
-        /* Store the values of the MSIX table in the s2io_nic structure */
-       store_xmsi_data(sp);
        /* reset Nic and bring it to known state */
        s2io_reset(sp);
 
        /*
-        * Initialize link state flags
+        * Initialize the link state flags
         * and the card state parameter
         */
        sp->state = 0;
-
        /* Initialize spinlocks */
-       for (i = 0; i < sp->config.tx_fifo_num; i++)
+       for (i = 0; i < config->tx_fifo_num; i++) {
                spin_lock_init(&mac_control->fifos[i].tx_lock);
+               mac_control->fifos[i].intr_type = config->intr_type;
+               mac_control->fifos[i].dev = sp->dev;
+               mac_control->fifos[i].multiq = config->multiq;
+       }
 
        /*
         * SXE-002: Configure link and activity LED to init state
@@ -8115,7 +11001,10 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                val64 = readq(&bar0->gpio_control);
        }
 
-       sp->rx_csum = 1;        /* Rx chksum verify enabled by default */
+       sp->rx_csum = 1; /* Rx chksum verify enabled by default */
+
+       for (i = 0; i < config->rx_ring_num; i++)
+               mac_control->rings[i].rx_csum = sp->rx_csum;
 
        if (register_netdev(dev)) {
                DBG_PRINT(ERR_DBG, "Device registration failed\n");
@@ -8123,86 +11012,31 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                goto register_failed;
        }
        s2io_vpd_read(sp);
-       DBG_PRINT(ERR_DBG, "Copyright(c) 2002-2007 Neterion Inc.\n");
-       DBG_PRINT(ERR_DBG, "%s: Neterion %s (rev %d)\n",dev->name,
-                 sp->product_name, pdev->revision);
+       DBG_PRINT(ERR_DBG, "%s: Neterion %s (rev %d)\n", dev->name,
+                 sp->product_name, get_xena_rev_id(sp->pdev));
        DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name,
                  s2io_driver_version);
-       DBG_PRINT(ERR_DBG, "%s: MAC ADDR: %s\n",
-                 dev->name, print_mac(mac, dev->dev_addr));
+       DBG_PRINT(ERR_DBG, "%s: MAC ADDR: "
+                       "%02x:%02x:%02x:%02x:%02x:%02x, ", dev->name,
+                       sp->def_mac_addr[0].mac_addr[0],
+                       sp->def_mac_addr[0].mac_addr[1],
+                       sp->def_mac_addr[0].mac_addr[2],
+                       sp->def_mac_addr[0].mac_addr[3],
+                       sp->def_mac_addr[0].mac_addr[4],
+                       sp->def_mac_addr[0].mac_addr[5]);
        DBG_PRINT(ERR_DBG, "SERIAL NUMBER: %s\n", sp->serial_num);
-       if (sp->device_type & XFRAME_II_DEVICE) {
+       if (sp->device_type == XFRAME_II_DEVICE) {
                mode = s2io_print_pci_mode(sp);
                if (mode < 0) {
                        DBG_PRINT(ERR_DBG, " Unsupported PCI bus mode\n");
                        ret = -EBADSLT;
-                       unregister_netdev(dev);
-                       goto set_swap_failed;
+                       goto check_pci_bus_mode_failed;
                }
        }
-       switch(sp->rxd_mode) {
-               case RXD_MODE_1:
-                   DBG_PRINT(ERR_DBG, "%s: 1-Buffer receive mode enabled\n",
-                                               dev->name);
-                   break;
-               case RXD_MODE_3B:
-                   DBG_PRINT(ERR_DBG, "%s: 2-Buffer receive mode enabled\n",
-                                               dev->name);
-                   break;
-       }
-
-       switch (sp->config.napi) {
-       case 0:
-               DBG_PRINT(ERR_DBG, "%s: NAPI disabled\n", dev->name);
-               break;
-       case 1:
-               DBG_PRINT(ERR_DBG, "%s: NAPI enabled\n", dev->name);
-               break;
-       }
 
-       DBG_PRINT(ERR_DBG, "%s: Using %d Tx fifo(s)\n", dev->name,
-               sp->config.tx_fifo_num);
-
-       DBG_PRINT(ERR_DBG, "%s: Using %d Rx ring(s)\n", dev->name,
-                 sp->config.rx_ring_num);
-
-       switch(sp->config.intr_type) {
-               case INTA:
-                   DBG_PRINT(ERR_DBG, "%s: Interrupt type INTA\n", dev->name);
-                   break;
-               case MSI_X:
-                   DBG_PRINT(ERR_DBG, "%s: Interrupt type MSI-X\n", dev->name);
-                   break;
-       }
-       if (sp->config.multiq) {
-       for (i = 0; i < sp->config.tx_fifo_num; i++)
-               mac_control->fifos[i].multiq = config->multiq;
-               DBG_PRINT(ERR_DBG, "%s: Multiqueue support enabled\n",
-                       dev->name);
-       } else
-               DBG_PRINT(ERR_DBG, "%s: Multiqueue support disabled\n",
-                       dev->name);
 
-       switch (sp->config.tx_steering_type) {
-       case NO_STEERING:
-               DBG_PRINT(ERR_DBG, "%s: No steering enabled for"
-                       " transmit\n", dev->name);
-                       break;
-       case TX_PRIORITY_STEERING:
-               DBG_PRINT(ERR_DBG, "%s: Priority steering enabled for"
-                       " transmit\n", dev->name);
-               break;
-       case TX_DEFAULT_STEERING:
-               DBG_PRINT(ERR_DBG, "%s: Default steering enabled for"
-                       " transmit\n", dev->name);
-       }
+       print_static_param_list(dev);
 
-       if (sp->lro)
-               DBG_PRINT(ERR_DBG, "%s: Large receive offload enabled\n",
-                         dev->name);
-       if (ufo)
-               DBG_PRINT(ERR_DBG, "%s: UDP Fragmentation Offload(UFO)"
-                                       " enabled\n", dev->name);
        /* Initialize device name */
        sprintf(sp->name, "%s Neterion %s", dev->name, sp->product_name);
 
@@ -8213,21 +11047,38 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         */
        netif_carrier_off(dev);
 
+#ifdef SNMP_SUPPORT
+       s2io_snmp_init(sp);
+#endif
+
        return 0;
 
-      register_failed:
-      set_swap_failed:
+check_pci_bus_mode_failed:
+       unregister_netdev(dev);
+
+register_failed:
+mem_alloc_failed:
+       free_shared_mem(sp);
+
+configuration_failed:
+set_swap_failed:
        iounmap(sp->bar1);
-      bar1_remap_failed:
+
+bar1_remap_failed:
        iounmap(sp->bar0);
-      bar0_remap_failed:
-      mem_alloc_failed:
-       free_shared_mem(sp);
-       pci_disable_device(pdev);
-       pci_release_regions(pdev);
+
+bar0_remap_failed:
        pci_set_drvdata(pdev, NULL);
        free_netdev(dev);
 
+alloc_etherdev_failed:
+       pci_release_regions(pdev);
+
+pci_request_regions_failed:
+set_dma_mask_failed:
+       pci_disable_device(pdev);
+
+enable_device_failed:
        return ret;
 }
 
@@ -8251,17 +11102,22 @@ static void __devexit s2io_rem_nic(struct pci_dev *pdev)
                return;
        }
 
+       sp = dev->priv;
        flush_scheduled_work();
 
-       sp = dev->priv;
        unregister_netdev(dev);
 
        free_shared_mem(sp);
        iounmap(sp->bar0);
        iounmap(sp->bar1);
        pci_release_regions(pdev);
+
        pci_set_drvdata(pdev, NULL);
+#ifdef SNMP_SUPPORT
+       s2io_snmp_exit(sp);
+#endif
        free_netdev(dev);
+
        pci_disable_device(pdev);
 }
 
@@ -8273,46 +11129,57 @@ static void __devexit s2io_rem_nic(struct pci_dev *pdev)
 
 static int __init s2io_starter(void)
 {
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
+       lro_enable = lro;
+#endif
+
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17))
+       return pci_module_init(&s2io_driver);
+#else
        return pci_register_driver(&s2io_driver);
+#endif
 }
 
 /**
  * s2io_closer - Cleanup routine for the driver
- * Description: This function is the cleanup routine for the driver. It unregist * ers the driver.
+ * Description: This function is the cleanup routine for the driver.
+ * It unregisters the driver.
  */
 
 static __exit void s2io_closer(void)
 {
        pci_unregister_driver(&s2io_driver);
+
+       /* Reset the hyper transport interrupts if set on AMD 8132 bridge */
+       if (intr_type == MSI_X)
+               amd_8132_update_hyper_tx(S2IO_BIT_RESET);
+
        DBG_PRINT(INIT_DBG, "cleanup done\n");
 }
 
 module_init(s2io_starter);
 module_exit(s2io_closer);
 
+
 static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,
                struct tcphdr **tcp, struct RxD_t *rxdp,
-               struct s2io_nic *sp)
+               struct ring_info *ring, u16 vid)
 {
        int ip_off;
-       u8 l2_type = (u8)((rxdp->Control_1 >> 37) & 0x7), ip_len;
+       u32 daddr = 0;
 
-       if (!(rxdp->Control_1 & RXD_FRAME_PROTO_TCP)) {
-               DBG_PRINT(INIT_DBG,"%s: Non-TCP frames not supported for LRO\n",
-                         __FUNCTION__);
-               return -1;
-       }
+       u8 l2_type = (u8)((rxdp->Control_1 >> 37) & 0x7), ip_len;
 
-       /* Checking for DIX type or DIX type with VLAN */
-       if ((l2_type == 0)
-               || (l2_type == 4)) {
+       if ((l2_type == 0) ||    /* DIX type */
+               (l2_type == 4)) {        /* DIX type with VLAN */
                ip_off = HEADER_ETHERNET_II_802_3_SIZE;
                /*
-                * If vlan stripping is disabled and the frame is VLAN tagged,
-                * shift the offset by the VLAN header size bytes.
-                */
-               if ((!vlan_strip_flag) &&
-                       (rxdp->Control_1 & RXD_FRAME_VLAN_TAG))
+               * If vlan stripping is disabled and the frame is VLAN tagged,
+               * shift the offset by the VLAN header size bytes.
+               */
+               if ((ring->vlan_strip_flag == S2IO_DO_NOT_STRIP_VLAN_TAG) &&
+                       vid)
                        ip_off += HEADER_VLAN_SIZE;
        } else {
                /* LLC, SNAP etc are considered non-mergeable */
@@ -8324,58 +11191,202 @@ static int check_L2_lro_capable(u8 *buffer, struct iphdr **ip,
        ip_len <<= 2;
        *tcp = (struct tcphdr *)((unsigned long)*ip + ip_len);
 
+       if (lro_enable == S2IO_DONT_AGGR_FWD_PKTS) {
+
+               daddr = (*ip)->daddr;
+               /* Check if it is a broadcast or multicast ip */
+               if (!IN_MULTICAST(daddr) && (INADDR_BROADCAST != daddr)) {
+                       struct in_device *in_dev = NULL;
+                       struct in_ifaddr *ifa = NULL;
+                       /*
+                        * Does this packets destined for this interface?
+                        */
+                       in_dev = ring->dev->ip_ptr;
+                       if (in_dev != NULL) {
+                               ifa = in_dev->ifa_list;
+                               while (ifa != NULL) {
+                                       if (daddr == ifa->ifa_local)
+                                               return 0;
+                                       ifa = ifa->ifa_next;
+                               }
+                       }
+
+                       /* Check if it is a vlan packet */
+                       if (ring->vlgrp && vid) {
+                               struct net_device *vlan_dev = NULL;
+                               struct vlan_dev_info *vlan_info = NULL;
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21))
+                               vlan_dev =
+                                       vlan_group_get_device(ring->vlgrp, vid);
+#else
+                               vlan_dev = ring->vlgrp->vlan_devices[vid];
+#endif
+                               if (!vlan_dev)
+                                       goto donot_aggr;
+
+                               vlan_info = 
+                                       (struct vlan_dev_info *)(vlan_dev->priv);
+                               if (!vlan_info)
+                                       goto donot_aggr;
+
+                               /* Is this a registered vlan? */
+                               if (vlan_info->real_dev == ring->dev)
+                                       return 0;
+                       }
+
+donot_aggr:
+                       /* Packet is to be forwarded. Don't aggregate */
+                       return -1;
+               }
+       }
+
        return 0;
 }
 
 static int check_for_socket_match(struct lro *lro, struct iphdr *ip,
                                  struct tcphdr *tcp)
 {
-       DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);
+       DBG_PRINT(INFO_DBG, "%s: Been here...\n", __FUNCTION__);
        if ((lro->iph->saddr != ip->saddr) || (lro->iph->daddr != ip->daddr) ||
-          (lro->tcph->source != tcp->source) || (lro->tcph->dest != tcp->dest))
+               (lro->tcph->source != tcp->source) ||
+               (lro->tcph->dest != tcp->dest))
                return -1;
        return 0;
 }
 
+#define S2IO_TS_SAVE 2
+#define S2IO_TS_VERIFY 1
+#define S2IO_TS_UPDATE 0
+
+static int update_tcp_timestamp_slow(struct tcphdr *th, struct lro *lro, int save)
+{
+       unsigned char *ptr;
+       int opt_cnt = 0;
+       int length = (th->doff*4) - sizeof(struct tcphdr);
+
+       ptr = (unsigned char *)(th + 1);
+
+       while (length > 0) {
+               int opcode=*ptr++;
+               int opsize;
+
+               switch (opcode) {
+                       case TCPOPT_EOL:
+                               return 1;
+                       case TCPOPT_NOP:
+                               length--;
+                               continue;
+                       default:
+                               /* Not sure about this check, but not taking a chance ... */
+                               if ((opcode == TCPOPT_SACK_PERM) || (opcode == TCPOPT_SACK))
+                                       return 1;
+                               opsize=*ptr++;
+                               if (opsize < 2)
+                                       return 1;
+                               /* don't parse partial options */
+                               if (opsize > length)
+                                       return 1;
+                               if (++opt_cnt > 3)
+                                       return 1;
+                               if (opcode == TCPOPT_TIMESTAMP) {
+                                       if (opsize==TCPOLEN_TIMESTAMP) {
+
+                                               if (save == S2IO_TS_SAVE){
+                                                       lro->cur_tsval = ntohl(* (__be32 *)ptr);
+                                                       lro->cur_tsecr = *(__be32 *)(ptr + 4);
+                                               }
+                                               else if (save == S2IO_TS_VERIFY){
+                                               /* Ensure timestamp value increases monotonically */
+                                                       if (lro->cur_tsval > ntohl(*((__be32 *)ptr)))
+                                                               return -1;
+                                                       /* timestamp echo reply should be non-zero */
+                                                       if (*((__be32 *)(ptr + 4)) == 0)
+                                                               return -1;
+                                               }
+                                               else {
+                                                       __be32 *tmp_ptr = (__be32 *)(ptr + 4);
+                                                       *tmp_ptr = lro->cur_tsecr;
+                                               }
+                                               return 0;
+                                       }
+                               }
+                               ptr+=opsize-2;
+                               length-=opsize;
+               }
+       }
+       return 1;
+}
+
+static int update_tcp_timestamp(struct tcphdr *th, struct lro *lro, int save)
+{
+       if (th->doff == sizeof(struct tcphdr)>>2) {
+               return 1;
+       } else if (th->doff == (sizeof(struct tcphdr)>>2)
+                       +(TCPOLEN_TSTAMP_ALIGNED>>2)) {
+               __be32 *ptr = (__be32 *)(th + 1);
+               if (*ptr == htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16)
+                                 | (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) {
+
+                       ++ptr;
+                       if (save == S2IO_TS_SAVE){
+                               lro->cur_tsval = ntohl(*(__be32 *)ptr);
+                               lro->cur_tsecr = *(__be32 *)(ptr + 1);
+                       }
+                       else if (save == S2IO_TS_VERIFY){
+                               /* Ensure timestamp value increases monotonically */
+                               if (lro->cur_tsval > ntohl(*((__be32 *)ptr)))
+                                       return -1;
+
+                               /* timestamp echo reply should be non-zero */
+                               if (*((__be32 *)(ptr + 1)) == 0)
+                                       return -1;
+                       }
+                       else
+                               *(ptr + 1) = lro->cur_tsecr;
+
+                       return 0;
+               }
+       }
+       return (update_tcp_timestamp_slow(th, lro, save));
+}
+
 static inline int get_l4_pyld_length(struct iphdr *ip, struct tcphdr *tcp)
 {
        return(ntohs(ip->tot_len) - (ip->ihl << 2) - (tcp->doff << 2));
 }
 
-static void initiate_new_session(struct lro *lro, u8 *l2h,
-       struct iphdr *ip, struct tcphdr *tcp, u32 tcp_pyld_len, u16 vlan_tag)
+static void initiate_new_session(struct lro *lro,
+       struct iphdr *ip, struct tcphdr *tcp, u32 tcp_pyld_len)
 {
-       DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);
-       lro->l2h = l2h;
+       DBG_PRINT(INFO_DBG, "%s: Been here...\n", __FUNCTION__);
        lro->iph = ip;
        lro->tcph = tcp;
        lro->tcp_next_seq = tcp_pyld_len + ntohl(tcp->seq);
        lro->tcp_ack = tcp->ack_seq;
+       lro->window = tcp->window;
        lro->sg_num = 1;
        lro->total_len = ntohs(ip->tot_len);
        lro->frags_len = 0;
-       lro->vlan_tag = vlan_tag;
+
        /*
         * check if we saw TCP timestamp. Other consistency checks have
         * already been done.
-        */
-       if (tcp->doff == 8) {
-               __be32 *ptr;
-               ptr = (__be32 *)(tcp+1);
+        */
+       if (!update_tcp_timestamp(tcp, lro, S2IO_TS_SAVE))
                lro->saw_ts = 1;
-               lro->cur_tsval = ntohl(*(ptr+1));
-               lro->cur_tsecr = *(ptr+2);
-       }
+
        lro->in_use = 1;
 }
 
-static void update_L3L4_header(struct s2io_nic *sp, struct lro *lro)
+static void update_L3L4_header(struct ring_info *ring, struct lro *lro,
+int ring_no)
 {
        struct iphdr *ip = lro->iph;
        struct tcphdr *tcp = lro->tcph;
-       __sum16 nchk;
-       struct stat_block *statinfo = sp->mac_control.stats_info;
-       DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);
+       u16 nchk;
+
+       DBG_PRINT(INFO_DBG, "%s: Been here...\n", __FUNCTION__);
 
        /* Update L3 header */
        ip->tot_len = htons(lro->total_len);
@@ -8388,22 +11399,20 @@ static void update_L3L4_header(struct s2io_nic *sp, struct lro *lro)
        tcp->window = lro->window;
 
        /* Update tsecr field if this session has timestamps enabled */
-       if (lro->saw_ts) {
-               __be32 *ptr = (__be32 *)(tcp + 1);
-               *(ptr+2) = lro->cur_tsecr;
-       }
+       if (lro->saw_ts)
+               update_tcp_timestamp(tcp, lro, S2IO_TS_UPDATE);
 
        /* Update counters required for calculation of
         * average no. of packets aggregated.
         */
-       statinfo->sw_stat.sum_avg_pkts_aggregated += lro->sg_num;
-       statinfo->sw_stat.num_aggregations++;
+       ring->rx_ring_stat->sw_lro_stat.sum_avg_pkts_aggregated += lro->sg_num;
+       ring->rx_ring_stat->sw_lro_stat.num_aggregations++;
 }
 
 static void aggregate_new_rx(struct lro *lro, struct iphdr *ip,
                struct tcphdr *tcp, u32 l4_pyld)
 {
-       DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);
+       DBG_PRINT(INFO_DBG, "%s: Been here...\n", __FUNCTION__);
        lro->total_len += l4_pyld;
        lro->frags_len += l4_pyld;
        lro->tcp_next_seq += l4_pyld;
@@ -8413,23 +11422,16 @@ static void aggregate_new_rx(struct lro *lro, struct iphdr *ip,
        lro->tcp_ack = tcp->ack_seq;
        lro->window = tcp->window;
 
-       if (lro->saw_ts) {
-               __be32 *ptr;
-               /* Update tsecr and tsval from this packet */
-               ptr = (__be32 *)(tcp+1);
-               lro->cur_tsval = ntohl(*(ptr+1));
-               lro->cur_tsecr = *(ptr + 2);
-       }
+       if (lro->saw_ts)
+               update_tcp_timestamp(tcp, lro, S2IO_TS_SAVE);
 }
 
 static int verify_l3_l4_lro_capable(struct lro *l_lro, struct iphdr *ip,
-                                   struct tcphdr *tcp, u32 tcp_pyld_len)
+                       struct tcphdr *tcp, u32 tcp_pyld_len, u8 agg_ack)
 {
-       u8 *ptr;
-
-       DBG_PRINT(INFO_DBG,"%s: Been here...\n", __FUNCTION__);
+       DBG_PRINT(INFO_DBG, "%s: Been here...\n", __FUNCTION__);
 
-       if (!tcp_pyld_len) {
+       if (!agg_ack && !tcp_pyld_len) {
                /* Runt frame or a pure ack */
                return -1;
        }
@@ -8437,11 +11439,16 @@ static int verify_l3_l4_lro_capable(struct lro *l_lro, struct iphdr *ip,
        if (ip->ihl != 5) /* IP has options */
                return -1;
 
+       /*
+        * TODO: Currently works with normal ECN. No support for
+        * ECN with nonces(RFC3540).
+        */
        /* If we see CE codepoint in IP header, packet is not mergeable */
        if (INET_ECN_is_ce(ipv4_get_dsfield(ip)))
                return -1;
 
        /* If we see ECE or CWR flags in TCP header, packet is not mergeable */
+
        if (tcp->urg || tcp->psh || tcp->rst || tcp->syn || tcp->fin ||
                                    tcp->ece || tcp->cwr || !tcp->ack) {
                /*
@@ -8452,55 +11459,34 @@ static int verify_l3_l4_lro_capable(struct lro *l_lro, struct iphdr *ip,
                return -1;
        }
 
-       /*
-        * Allow only one TCP timestamp option. Don't aggregate if
-        * any other options are detected.
-        */
-       if (tcp->doff != 5 && tcp->doff != 8)
-               return -1;
-
-       if (tcp->doff == 8) {
-               ptr = (u8 *)(tcp + 1);
-               while (*ptr == TCPOPT_NOP)
-                       ptr++;
-               if (*ptr != TCPOPT_TIMESTAMP || *(ptr+1) != TCPOLEN_TIMESTAMP)
-                       return -1;
-
-               /* Ensure timestamp value increases monotonically */
-               if (l_lro)
-                       if (l_lro->cur_tsval > ntohl(*((__be32 *)(ptr+2))))
-                               return -1;
-
-               /* timestamp echo reply should be non-zero */
-               if (*((__be32 *)(ptr+6)) == 0)
+       if (l_lro)
+               if (update_tcp_timestamp(tcp, l_lro, S2IO_TS_VERIFY) == -1)
                        return -1;
-       }
 
        return 0;
 }
 
 static int
-s2io_club_tcp_session(struct ring_info *ring_data, u8 *buffer, u8 **tcp,
-       u32 *tcp_len, struct lro **lro, struct RxD_t *rxdp,
-       struct s2io_nic *sp)
+s2io_club_tcp_session(struct ring_info *ring, u8 *buffer, u8 **tcp,
+       u32 *tcp_len, struct lro **lro, struct RxD_t *rxdp, u16 vid)
 {
        struct iphdr *ip;
        struct tcphdr *tcph;
        int ret = 0, i;
-       u16 vlan_tag = 0;
+       struct swLROStat *lro_stats = &ring->rx_ring_stat->sw_lro_stat;
 
        if (!(ret = check_L2_lro_capable(buffer, &ip, (struct tcphdr **)tcp,
-                                        rxdp, sp))) {
+                                        rxdp, ring, vid))) {
                DBG_PRINT(INFO_DBG,"IP Saddr: %x Daddr: %x\n",
                          ip->saddr, ip->daddr);
        } else
                return ret;
 
-       vlan_tag = RXD_GET_VLAN_TAG(rxdp->Control_2);
        tcph = (struct tcphdr *)*tcp;
        *tcp_len = get_l4_pyld_length(ip, tcph);
+
        for (i=0; i<MAX_LRO_SESSIONS; i++) {
-               struct lro *l_lro = &ring_data->lro0_n[i];
+               struct lro *l_lro = &ring->lro0_n[i];
                if (l_lro->in_use) {
                        if (check_for_socket_match(l_lro, ip, tcph))
                                continue;
@@ -8508,21 +11494,23 @@ s2io_club_tcp_session(struct ring_info *ring_data, u8 *buffer, u8 **tcp,
                        *lro = l_lro;
 
                        if ((*lro)->tcp_next_seq != ntohl(tcph->seq)) {
-                               DBG_PRINT(INFO_DBG, "%s:Out of order. expected "
-                                         "0x%x, actual 0x%x\n", __FUNCTION__,
-                                         (*lro)->tcp_next_seq,
-                                         ntohl(tcph->seq));
-
-                               sp->mac_control.stats_info->
-                                  sw_stat.outof_sequence_pkts++;
-                               ret = 2;
+                               DBG_PRINT(INFO_DBG,
+                                       "%s:Out of order. expected "
+                                       "0x%x, actual 0x%x\n", __FUNCTION__,
+                                       (*lro)->tcp_next_seq,
+                                       ntohl(tcph->seq));
+
+                               lro_stats->outof_sequence_pkts++;
+                               ret = LRO_FLUSH_BOTH;
                                break;
                        }
 
-                       if (!verify_l3_l4_lro_capable(l_lro, ip, tcph,*tcp_len))
-                               ret = 1; /* Aggregate */
+                       if (!verify_l3_l4_lro_capable(l_lro, ip, tcph,
+                                       *tcp_len, ring->aggr_ack))
+                               ret = LRO_AGGR_PACKET; /* Aggregate */
                        else
-                               ret = 2; /* Flush both */
+                               ret = LRO_FLUSH_BOTH; /* Flush both */
+
                        break;
                }
        }
@@ -8533,15 +11521,15 @@ s2io_club_tcp_session(struct ring_info *ring_data, u8 *buffer, u8 **tcp,
                 * don't create new LRO session. Just send this
                 * packet up.
                 */
-               if (verify_l3_l4_lro_capable(NULL, ip, tcph, *tcp_len)) {
+               if (verify_l3_l4_lro_capable(NULL, ip, tcph, *tcp_len,
+                               ring->aggr_ack))
                        return 5;
-               }
 
                for (i=0; i<MAX_LRO_SESSIONS; i++) {
-                       struct lro *l_lro = &ring_data->lro0_n[i];
+                       struct lro *l_lro = &ring->lro0_n[i];
                        if (!(l_lro->in_use)) {
                                *lro = l_lro;
-                               ret = 3; /* Begin anew */
+                               ret = LRO_BEG_AGGR; /* Begin anew */
                                break;
                        }
                }
@@ -8554,87 +11542,95 @@ s2io_club_tcp_session(struct ring_info *ring_data, u8 *buffer, u8 **tcp,
                return ret;
        }
 
-       switch (ret) {
-               case 3:
-                       initiate_new_session(*lro, buffer, ip, tcph, *tcp_len,
-                                                               vlan_tag);
-                       break;
-               case 2:
-                       update_L3L4_header(sp, *lro);
-                       break;
-               case 1:
-                       aggregate_new_rx(*lro, ip, tcph, *tcp_len);
-                       if ((*lro)->sg_num == sp->lro_max_aggr_per_sess) {
-                               update_L3L4_header(sp, *lro);
-                               ret = 4; /* Flush the LRO */
-                       }
-                       break;
-               default:
-                       DBG_PRINT(ERR_DBG,"%s:Dont know, can't say!!\n",
-                               __FUNCTION__);
-                       break;
-       }
+       if (LRO_AGGR_PACKET == ret) {
+               aggregate_new_rx(*lro, ip, tcph, *tcp_len);
+               if ((*lro)->sg_num == ring->lro_max_aggr_per_sess) {
+                       update_L3L4_header(ring, *lro, ring->ring_no);
+                       ret = LRO_FLUSH_SESSION; /* Flush the LRO */
+               }
+       } else if (LRO_BEG_AGGR == ret)
+               initiate_new_session(*lro, ip, tcph, *tcp_len);
+       else if (LRO_FLUSH_BOTH == ret)
+               update_L3L4_header(ring, *lro, ring->ring_no);
+       else
+               DBG_PRINT(ERR_DBG, "%s:LRO Unhandled.\n", __FUNCTION__);
 
        return ret;
 }
 
-static void clear_lro_session(struct lro *lro)
-{
-       static u16 lro_struct_size = sizeof(struct lro);
-
-       memset(lro, 0, lro_struct_size);
-}
-
-static void queue_rx_frame(struct sk_buff *skb, u16 vlan_tag)
-{
-       struct net_device *dev = skb->dev;
-       struct s2io_nic *sp = dev->priv;
-
-       skb->protocol = eth_type_trans(skb, dev);
-       if (sp->vlgrp && vlan_tag
-               && (vlan_strip_flag)) {
-               /* Queueing the vlan frame to the upper layer */
-               if (sp->config.napi)
-                       vlan_hwaccel_receive_skb(skb, sp->vlgrp, vlan_tag);
-               else
-                       vlan_hwaccel_rx(skb, sp->vlgrp, vlan_tag);
-       } else {
-               if (sp->config.napi)
-                       netif_receive_skb(skb);
-               else
-                       netif_rx(skb);
-       }
-}
-
-static void lro_append_pkt(struct s2io_nic *sp, struct lro *lro,
-                          struct sk_buff *skb,
-                          u32 tcp_len)
+static void lro_append_pkt(struct ring_info *ring, struct lro *lro,
+       struct sk_buff *skb, u32 tcp_len, u8 aggr_ack)
 {
        struct sk_buff *first = lro->parent;
+       struct sk_buff *frag_list = NULL;
+       struct sk_buff *data_skb = NULL;
+       int data_skb_true_size = 0;
+       struct swLROStat *lro_stats = &ring->rx_ring_stat->sw_lro_stat;
 
        first->len += tcp_len;
        first->data_len = lro->frags_len;
-       skb_pull(skb, (skb->len - tcp_len));
-       if (skb_shinfo(first)->frag_list)
-               lro->last_frag->next = skb;
-       else
-               skb_shinfo(first)->frag_list = skb;
-       first->truesize += skb->truesize;
-       lro->last_frag = skb;
-       sp->mac_control.stats_info->sw_stat.clubbed_frms_cnt++;
-       return;
-}
+       lro_stats->clubbed_frms_cnt++;
 
+       if (aggr_ack && (tcp_len == 0)) {
+               dev_kfree_skb_any(skb);
+               return;
+       }
+
+       if (ring->rxd_mode == RXD_MODE_5) {
+               /* leave the Buf2 which contains l3l4 header */
+               data_skb = skb_shinfo(skb)->frag_list;
+               data_skb_true_size = data_skb->truesize;
+               skb_shinfo(skb)->frag_list = NULL;
+               skb->data_len = 0;
+               skb->len = skb->len - tcp_len;
+               /* calcualate the size of the skbs containg only data*/
+               for (frag_list = data_skb; frag_list->next;
+                       frag_list = frag_list->next)
+                       data_skb_true_size += frag_list->truesize;
+
+               /* single header skb with truesize*/
+               skb->truesize -= data_skb_true_size;
+               /* Free the SKB containing the l3l4 header*/
+               dev_kfree_skb(skb);
+               /* skb will now point to the actual l3l4 data*/
+               skb = data_skb;
+               skb->truesize = data_skb_true_size;
+       } else
+               skb_pull(skb, (skb->len - tcp_len));
+
+       frag_list = skb_shinfo(first)->frag_list;
+       if (frag_list) {
+               if (lro->last_frag) /* valid only in 5 buffer mode */
+                       lro->last_frag->next = skb;
+       } else
+               skb_shinfo(first)->frag_list = skb;
+
+       first->truesize += skb->truesize; /*updating skb->truesize */
+
+       if (ring->rxd_mode == RXD_MODE_5) {
+               frag_list = data_skb;
+               if (frag_list) {
+                       /* Traverse to the end of the list*/
+                       for (; frag_list->next; frag_list = frag_list->next);
+               }
+               lro->last_frag = frag_list;
+       } else
+               lro->last_frag = skb;
+
+       return;
+}
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21))
 /**
- * s2io_io_error_detected - called when PCI error is detected
- * @pdev: Pointer to PCI device
- * @state: The current pci connection state
- *
- * This function is called after a PCI bus error affecting
- * this device has been detected.
- */
+* s2io_io_error_detected - called when PCI error is detected
+* @pdev: Pointer to PCI device
+* @state: The current pci connection state
+*
+* This function is called after a PCI bus error affecting
+* this device has been detected.
+*/
 static pci_ers_result_t s2io_io_error_detected(struct pci_dev *pdev,
-                                               pci_channel_state_t state)
+                                               pci_channel_state_t state)
 {
        struct net_device *netdev = pci_get_drvdata(pdev);
        struct s2io_nic *sp = netdev->priv;
@@ -8651,14 +11647,14 @@ static pci_ers_result_t s2io_io_error_detected(struct pci_dev *pdev,
 }
 
 /**
- * s2io_io_slot_reset - called after the pci bus has been reset.
- * @pdev: Pointer to PCI device
- *
- * Restart the card from scratch, as if from a cold-boot.
- * At this point, the card has exprienced a hard reset,
- * followed by fixups by BIOS, and has its config space
- * set up identically to what it was at cold boot.
- */
+* s2io_io_slot_reset - called after the pci bus has been reset.
+* @pdev: Pointer to PCI device
+*
+* Restart the card from scratch, as if from a cold-boot.
+* At this point, the card has exprienced a hard reset,
+* followed by fixups by BIOS, and has its config space
+* set up identically to what it was at cold boot.
+*/
 static pci_ers_result_t s2io_io_slot_reset(struct pci_dev *pdev)
 {
        struct net_device *netdev = pci_get_drvdata(pdev);
@@ -8666,7 +11662,7 @@ static pci_ers_result_t s2io_io_slot_reset(struct pci_dev *pdev)
 
        if (pci_enable_device(pdev)) {
                printk(KERN_ERR "s2io: "
-                      "Cannot re-enable PCI device after reset.\n");
+                               "Cannot re-enable PCI device after reset.\n");
                return PCI_ERS_RESULT_DISCONNECT;
        }
 
@@ -8677,12 +11673,12 @@ static pci_ers_result_t s2io_io_slot_reset(struct pci_dev *pdev)
 }
 
 /**
- * s2io_io_resume - called when traffic can start flowing again.
- * @pdev: Pointer to PCI device
- *
- * This callback is called when the error recovery driver tells
- * us that its OK to resume normal operation.
- */
+* s2io_io_resume - called when traffic can start flowing again.
+* @pdev: Pointer to PCI device
+*
+* This callback is called when the error recovery driver tells
+* us that its OK to resume normal operation.
+*/
 static void s2io_io_resume(struct pci_dev *pdev)
 {
        struct net_device *netdev = pci_get_drvdata(pdev);
@@ -8691,18 +11687,1906 @@ static void s2io_io_resume(struct pci_dev *pdev)
        if (netif_running(netdev)) {
                if (s2io_card_up(sp)) {
                        printk(KERN_ERR "s2io: "
-                              "Can't bring device back up after reset.\n");
+                               "Can't bring device back up after reset.\n");
                        return;
                }
 
                if (s2io_set_mac_addr(netdev, netdev->dev_addr) == FAILURE) {
                        s2io_card_down(sp);
                        printk(KERN_ERR "s2io: "
-                              "Can't resetore mac addr after reset.\n");
+                               "Can't resetore mac addr after reset.\n");
                        return;
                }
        }
 
        netif_device_attach(netdev);
-       netif_tx_wake_all_queues(netdev);
 }
+#endif
+
+/* Following code not present in kernel release */
+
+int s2io_ioctl_util(struct s2io_nic *sp, struct ifreq *rq, int cmd)
+{
+       int ret;
+       u8 mac_addr[6];
+       switch (cmd) {
+       /* Private IOCTLs used by the util tool. */
+       case SIOCDEVPRIVATE + 4:
+       {
+               struct ioctlInfo *io = (struct ioctlInfo *) rq->ifr_data;
+               struct config_param *config = &sp->config;
+               int i, j;
+               int lst_size = config->max_txds * sizeof(struct TxD);
+               void *to_buf = io->buffer, *fr_buf;
+               io->size = 0;
+
+               DBG_PRINT(INFO_DBG, "Tx get_offset %d, "
+                         "put_offset %d \n",
+                         sp->mac_control.fifos[0].
+                         tx_curr_get_info.offset,
+                         sp->mac_control.fifos[0].
+                         tx_curr_put_info.offset);
+
+               for (i = 0; i < config->tx_fifo_num; i++) {
+                       int fifo_len = config->tx_cfg[i].fifo_len;
+                       io->size += fifo_len;
+                       for (j = 0; j < fifo_len; j++) {
+                               fr_buf = sp->mac_control.fifos[i].
+                                               list_info[j].
+                                               list_virt_addr;
+                               ret = copy_to_user(to_buf,
+                                                  fr_buf,
+                                                  lst_size);
+                               if (ret)
+                                       return -EFAULT;
+                               to_buf += lst_size;
+                       }
+               }
+               io->size *= lst_size;
+               break;
+       }
+
+       case SIOCDEVPRIVATE + 5:
+       {
+               struct ioctlInfo *io = (struct ioctlInfo *) rq->ifr_data;
+               int i, j, row_sz;
+
+               io->size = sp->mac_control.stats_mem_sz;
+               s2io_updt_stats(sp);
+
+               row_sz = (io->size + 15)/16;
+               DBG_PRINT(INFO_DBG, "Stats Dump:\n");
+               for (i = 0; i <  row_sz; i++) {
+                       DBG_PRINT(INFO_DBG, "%03x: ", (i*16));
+                       for (j = 0; j < 16; j++) {
+                               u8 *x = (u8 *)
+                               (sp->mac_control.stats_mem + (i*16)+j);
+                               if (j == 8)
+                                       DBG_PRINT(INFO_DBG, " ");
+                               DBG_PRINT(INFO_DBG, "%02x ", *x);
+                               if (((i*16)+j) == io->size-1)
+                                       goto end;
+                       }
+                       DBG_PRINT(INFO_DBG, "\n");
+               }
+end:
+               DBG_PRINT(INFO_DBG, "\n");
+
+               ret = copy_to_user((void *)io->buffer,
+                       (void *)sp->mac_control.stats_mem,
+                       io->size);
+               if (ret)
+                       return -EFAULT;
+               break;
+       }
+
+       case SIOCDEVPRIVATE + 7:
+       {
+               unsigned int i = 0, j = 0;
+               struct ioctlInfo *io = (struct ioctlInfo *) rq->ifr_data;
+
+               DBG_PRINT(INFO_DBG, "Rx get_offset %d, "
+                         "put_offset %d \n",
+                         sp->mac_control.rings[0].
+                         rx_curr_get_info.offset,
+                         sp->mac_control.rings[0].
+                         rx_curr_put_info.offset);
+
+               io->size = 4096 * rx_ring_sz[0];
+               while (i < sp->config.rx_cfg[0].num_rxd) {
+                       char *c =
+                           (char *) sp->mac_control.rings[0].
+                               rx_blocks[j].block_virt_addr;
+                       ret = copy_to_user(
+                               (io->buffer + (j * 4096)),
+                               c, 4096);
+                       if (ret)
+                               return -EFAULT;
+                       i += (MAX_RXDS_PER_BLOCK_1 + 1);
+                       j++;
+               }
+               break;
+       }
+
+       case SIOCDEVPRIVATE + 8:
+       {
+               struct spdm_cfg *io = (struct spdm_cfg *)rq->ifr_data;
+               spdm_data_processor(io, sp);
+               break;
+       }
+
+       case SIOCDEVPRIVATE + 9:
+       {
+               struct ioctlInfo *io = (struct ioctlInfo *) rq->ifr_data;
+               u64 val64;
+               if (!is_s2io_card_up(sp)) {
+                       DBG_PRINT(ERR_DBG,
+                               "%s: Device is down!!\n", __FUNCTION__);
+                       break;
+               }
+
+               val64 = readq((sp->bar0 + io->offset));
+               io->value = val64;
+               break;
+       }
+
+       case SIOCDEVPRIVATE + 10:
+       {
+               struct ioctlInfo *io = (struct ioctlInfo *) rq->ifr_data;
+               writeq(io->value, (sp->bar0 + io->offset));
+               break;
+       }
+
+       case SIOCDEVPRIVATE + 11:
+       {
+               struct ioctlInfo *io = (struct ioctlInfo *) rq->ifr_data;
+               sp->exec_mode = io->value;
+               break;
+       }
+
+       case SIOCDEVPRIVATE + 12:
+       {
+               struct ioctlInfo *io = (struct ioctlInfo *) rq->ifr_data;
+               mac_addr[5] = (u8) (io->value);
+               mac_addr[4] = (u8) (io->value >> 8);
+               mac_addr[3] = (u8) (io->value >> 16);
+               mac_addr[2] = (u8) (io->value >> 24);
+               mac_addr[1] = (u8) (io->value >> 32);
+               mac_addr[0] = (u8) (io->value >> 40);
+               do_s2io_prog_unicast(sp->dev, mac_addr);
+               break;
+       }
+
+       case SIOCDEVPRIVATE + 13:
+       {
+               struct ioctlInfo *io = (struct ioctlInfo *) rq->ifr_data;
+               mac_addr[5] = (u8) (io->value);
+               mac_addr[4] = (u8) (io->value >> 8);
+               mac_addr[3] = (u8) (io->value >> 16);
+               mac_addr[2] = (u8) (io->value >> 24);
+               mac_addr[1] = (u8) (io->value >> 32);
+               mac_addr[0] = (u8) (io->value >> 40);
+               do_s2io_add_mc(sp, mac_addr);
+               break;
+       }
+
+       case SIOCDEVPRIVATE + 14:
+       {
+               struct ioctlInfo *io = (struct ioctlInfo *) rq->ifr_data;
+               do_s2io_delete_unicast_mc(sp, io->value);
+               break;
+       }
+
+       case SIOCDEVPRIVATE + 15:
+       {
+               struct ioctlInfo *io = (struct ioctlInfo *) rq->ifr_data;
+               io->value = do_s2io_read_unicast_mc(sp, io->offset);
+               break;
+       }
+
+       case SIOCDEVPRIVATE + 3:
+       {
+               general_info(sp, rq);
+               break;
+       }
+
+       default:
+               return -EOPNOTSUPP;
+       }
+       return SUCCESS;
+}
+
+/*General Info*/
+void general_info(struct s2io_nic *sp, struct ifreq *rq)
+{
+       struct net_device *dev = sp->dev;
+       struct ioctlInfo *io = (struct ioctlInfo *) rq->ifr_data;
+       struct XENA_dev_config __iomem *bar0 = sp->bar0;
+       register u64 val64 = 0;
+       int mode, i;
+       u16 pci_cmd;
+       u8 data;
+
+       /*Get current values of per ring msix interrupt counter*/
+       for (i = 0; i < 8; i++)
+               io->ginfo.rx_msix_intr_cnt[i] =
+                       sp->mac_control.rings[i].msix_intr_cnt;
+       io->ginfo.tx_intr_cnt = sp->tx_intr_cnt;
+       io->ginfo.rx_intr_cnt = sp->rx_intr_cnt;
+       io->ginfo.deviceid = sp->pdev->device;
+       io->ginfo.vendorid = PCI_VENDOR_ID_S2IO;
+       strcpy(io->ginfo.driver_version, s2io_driver_version);
+       io->ginfo.intr_type = sp->config.intr_type;
+       io->ginfo.tx_fifo_num = sp->config.tx_fifo_num;
+       io->ginfo.rx_ring_num = sp->config.rx_ring_num;
+       io->ginfo.rxd_mode = sp->rxd_mode;
+       io->ginfo.lro = sp->lro;
+       io->ginfo.lro_max_pkts = sp->lro_max_aggr_per_sess;
+       io->ginfo.napi = sp->config.napi;
+       io->ginfo.rx_steering_type = sp->config.rx_steering_type;
+       io->ginfo.rth_mask = rth_mask;
+       io->ginfo.vlan_tag_strip = sp->config.vlan_tag_strip;
+       io->ginfo.device_type = sp->device_type;
+       io->ginfo.mtu = dev->mtu;
+       pci_read_config_byte(sp->pdev, PCI_LATENCY_TIMER, &data);
+       io->ginfo.latency_timer = data;
+       io->ginfo.rx_csum = sp->rx_csum;
+       if (sp->device_type == XFRAME_II_DEVICE)
+               io->ginfo.tx_csum = ((dev->features & NETIF_F_HW_CSUM)? 1: 0);
+       else
+               io->ginfo.tx_csum = ((dev->features & NETIF_F_IP_CSUM)? 1: 0);
+
+       io->ginfo.sg = ((dev->features & NETIF_F_SG)?1:0);
+       io->ginfo.perm_addr = do_s2io_read_unicast_mc(sp, 0);
+
+       pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER, &(pci_cmd));
+       io->ginfo.pcix_cmd = pci_cmd;
+       io->ginfo.tx_urng = readq(&bar0->tti_data1_mem);
+       io->ginfo.rx_urng = readq(&bar0->rti_data1_mem);
+       io->ginfo.tx_ufc  = readq(&bar0->tti_data2_mem);
+       io->ginfo.rx_ufc  = readq(&bar0->rti_data2_mem);
+#ifndef NETIF_F_UFO
+       io->ginfo.ufo = 0;
+#else
+       io->ginfo.ufo = 0;
+       if ((sp->device_type == XFRAME_II_DEVICE) && ufo)
+               io->ginfo.ufo = 1;
+#endif
+#ifndef NETIF_F_TSO
+       io->ginfo.tso = 0;
+#else
+       io->ginfo.tso = 1;
+#endif
+       for (i = 0; i < sp->config.tx_fifo_num; i++)
+               io->ginfo.fifo_len[i] = sp->config.tx_cfg[i].fifo_len;
+
+       for (i = 0; i < sp->config.rx_ring_num; i++)
+               io->ginfo.rx_ring_size[i] = rx_ring_sz[i];
+
+       io->ginfo.rth_bucket_size = ((sp->config.rx_ring_num + 1)/2);
+       val64 = readq(&bar0->pci_mode);
+       mode = (u8)GET_PCI_MODE(val64);
+       if (val64 & PCI_MODE_UNKNOWN_MODE)
+               strcpy(io->ginfo.pci_type, "Unknown PCI mode");
+       if (s2io_on_nec_bridge(sp->pdev))
+               strcpy(io->ginfo.pci_type, "PCI-E bus");
+
+       switch (mode) {
+       case PCI_MODE_PCI_33:
+               strcpy(io->ginfo.pci_type, "33MHz PCI bus");
+               break;
+       case PCI_MODE_PCI_66:
+               strcpy(io->ginfo.pci_type, "66MHz PCI bus");
+               break;
+       case PCI_MODE_PCIX_M1_66:
+               strcpy(io->ginfo.pci_type, "66MHz PCIX(M1) bus");
+               break;
+       case PCI_MODE_PCIX_M1_100:
+               strcpy(io->ginfo.pci_type, "100MHz PCIX(M1) bus");
+               break;
+       case PCI_MODE_PCIX_M1_133:
+               strcpy(io->ginfo.pci_type, "133MHz PCIX(M1) bus");
+               break;
+       case PCI_MODE_PCIX_M2_66:
+               strcpy(io->ginfo.pci_type, "133MHz PCIX(M2) bus");
+               break;
+       case PCI_MODE_PCIX_M2_100:
+               strcpy(io->ginfo.pci_type, "200MHz PCIX(M2) bus");
+               break;
+       case PCI_MODE_PCIX_M2_133:
+               strcpy(io->ginfo.pci_type, "266MHz PCIX(M2) bus");
+               break;
+       default:
+               strcpy(io->ginfo.pci_type, "Unsupported bus speed");
+       }
+
+       if (sp->config.rx_steering_type == RTH_STEERING
+                || sp->config.rx_steering_type == RTH_STEERING_DEFAULT) {
+               val64 = readq(&bar0->rts_rth_cfg);
+
+               switch (rth_protocol) {
+               case 1:
+                       if (val64 & RTS_RTH_TCP_IPV4_EN)
+                               strcpy(io->ginfo.rth_steering_mask,
+                                       "RTS_RTH_TCP_IPV4_EN");
+                       break;
+               case 2:
+                       if (val64 & RTS_RTH_UDP_IPV4_EN)
+                               strcpy(io->ginfo.rth_steering_mask,
+                                       "RTS_RTH_UDP_IPV4_EN");
+                       break;
+               case 3:
+                       if (val64 & RTS_RTH_IPV4_EN)
+                               strcpy(io->ginfo.rth_steering_mask,
+                                       "RTS_RTH_IPV4_EN");
+                       break;
+               case 4:
+                       if (val64 & RTS_RTH_TCP_IPV6_EN)
+                               strcpy(io->ginfo.rth_steering_mask,
+                                       "RTS_RTH_TCP_IPV6_EN");
+                       break;
+               case 5:
+                       if (val64 & RTS_RTH_UDP_IPV6_EN)
+                               strcpy(io->ginfo.rth_steering_mask,
+                                       "RTS_RTH_UDP_IPV6_EN");
+                       break;
+               case 6:
+                       if (val64 & RTS_RTH_IPV6_EN)
+                               strcpy(io->ginfo.rth_steering_mask,
+                                       "RTS_RTH_IPV6_EN");
+                       break;
+               case 7:
+                       if (val64 & RTS_RTH_TCP_IPV6_EX_EN)
+                               strcpy(io->ginfo.rth_steering_mask,
+                                       "RTS_RTH_TCP_IPV6_EX_EN");
+                       break;
+               case 8:
+                       if (val64 & RTS_RTH_UDP_IPV6_EX_EN)
+                               strcpy(io->ginfo.rth_steering_mask,
+                                       "RTS_RTH_UDP_IPV6_EX_EN");
+                       break;
+               case 9:
+                       if (val64 & RTS_RTH_IPV6_EX_EN)
+                               strcpy(io->ginfo.rth_steering_mask,
+                                       "RTS_RTH_IPV6_EX_EN");
+                       break;
+               default:
+                       if (val64 & RTS_RTH_TCP_IPV4_EN)
+                               strcpy(io->ginfo.rth_steering_mask,
+                                       "RTS_RTH_TCP_IPV4_EN");
+               }
+       }
+}
+
+/**
+ * spdm_extract_table -
+ */
+static int spdm_extract_table(void *data, struct s2io_nic *nic)
+{
+       struct XENA_dev_config *bar0 = (struct XENA_dev_config *) nic->bar0;
+       u64 val64, table_content;
+       int line, entry = 0;
+
+       while (entry < nic->spdm_entry) {
+               u64 *tmp = (u64 *)((u8 *)data + (0x40 * entry));
+               for (line = 0; line < 8; line++, tmp++) {
+                       val64 = RTS_RTH_SPDM_MEM_CTRL_OFFSET(entry) |
+                               RTS_RTH_SPDM_MEM_CTRL_LINE_SEL(line) |
+                               RTS_RTH_SPDM_MEM_CTRL_STROBE;
+                       writeq(val64, &bar0->rts_rth_spdm_mem_ctrl);
+                       if (wait_for_cmd_complete(&bar0->rts_rth_spdm_mem_ctrl,
+                               RTS_RTH_SPDM_MEM_CTRL_STROBE,
+                               S2IO_BIT_RESET) == FAILURE)
+                               return FAILURE;
+                       table_content = readq(&bar0->rts_rth_spdm_mem_data);
+                       if (!line && !table_content)
+                               goto end;
+                       *tmp = table_content;
+               }
+               entry++;
+       }
+end:
+       return entry;
+}
+
+static int spdm_clear_table(struct s2io_nic *nic)
+{
+       struct XENA_dev_config *bar0 = (struct XENA_dev_config *) nic->bar0;
+       u64 val64;
+       u32 start_tbl, entry_offset, i;
+       void *element_addr;
+
+       val64 = readq(&bar0->spdm_bir_offset);
+       start_tbl = (u32)(val64 >> 32);
+       start_tbl *= 8;
+
+       for (entry_offset = 0; entry_offset < nic->spdm_entry; entry_offset++) {
+               element_addr = (void *)((u8 *)bar0 + start_tbl + entry_offset);
+               for (i = 0; i < 8; i++)
+                       writeq(0, element_addr + (i * 8));
+               msleep(20);
+       }
+       nic->spdm_entry = 0;
+       return 0;
+}
+
+/**
+ * s2io_program_spdm_table -
+ */
+static int s2io_program_spdm_table(struct spdm_cfg *info, int entry,
+               struct s2io_nic *nic)
+{
+       struct XENA_dev_config *bar0 = (struct XENA_dev_config *) nic->bar0;
+       u64 val64;
+       unsigned long tmp;
+       int ring;
+       u32 start_tbl, entry_offset;
+       struct spdm_entry element;
+       void *element_addr;
+       u16 sprt, dprt;
+       u32 sip, dip, hash;
+
+       ring = info->t_queue;
+       entry = nic->spdm_entry;
+
+       val64 = readq(&bar0->spdm_bir_offset);
+       start_tbl = (u32)(val64 >> 32);
+       start_tbl *= 8;
+       entry_offset = entry * sizeof(struct spdm_entry);
+
+       element_addr = (void *)((u8 *)bar0 + start_tbl + entry_offset);
+       tmp = (unsigned long)element_addr;
+
+       sprt = info->sprt;
+       dprt = info->dprt;
+       sip = info->sip;
+       dip = info->dip;
+       element.port_n_entry_control_0 = SPDM_PGM_L4_SRC_PORT(sprt) |
+                       SPDM_PGM_L4_DST_PORT(dprt) |
+                       SPDM_PGM_TARGET_QUEUE(ring);
+       if (info->sprt) {
+               if (rth_protocol == 1) /* TCP */
+                       element.port_n_entry_control_0 |= SPDM_PGM_IS_TCP |
+                               SPDM_PGM_IS_IPV4;
+               else if (rth_protocol == 2) /* UDP */
+                       element.port_n_entry_control_0 |= SPDM_PGM_IS_IPV4;
+       }
+       writeq(element.port_n_entry_control_0, element_addr);
+       tmp += 8;
+       element_addr = (void *)tmp;
+
+       element.ip.ipv4_sa_da = sip;
+       element.ip.ipv4_sa_da <<= 32;
+       element.ip.ipv4_sa_da |= dip;
+       writeq(element.ip.ipv4_sa_da, element_addr);
+
+       tmp += 8;
+       element_addr = (void *)tmp;
+       writeq(0, element_addr);
+       tmp += 8;
+       element_addr = (void *)tmp;
+       writeq(0, element_addr);
+       tmp += 8;
+       element_addr = (void *)tmp;
+       writeq(0, element_addr);
+       tmp += 8;
+       element_addr = (void *)tmp;
+       writeq(0, element_addr);
+       tmp += 8;
+       element_addr = (void *)tmp;
+       writeq(0, element_addr);
+       tmp += 8;
+       element_addr = (void *)tmp;
+
+       hash = info->hash;
+       element.hash_n_entry_control_1 = SPDM_PGM_HASH(hash) |
+                                       SPDM_PGM_ENABLE_ENTRY;
+       writeq(element.hash_n_entry_control_1, element_addr);
+       msleep(20);
+
+       return 0;
+}
+
+/**
+ * spdm_configure -
+ */
+static int spdm_configure(struct s2io_nic *nic, struct spdm_cfg *info)
+{
+       struct XENA_dev_config *bar0 = (struct XENA_dev_config *) nic->bar0;
+       struct net_device *dev = nic->dev;
+       u64 val64;
+       int ret;
+
+       val64 = readq(&bar0->spdm_bir_offset);
+       if (!(val64 & (vBIT(3, 0, 2)))) {
+               s2io_program_spdm_table(info, nic->spdm_entry, nic);
+               nic->spdm_entry++;
+               if (nic->spdm_entry == MAX_SUPPORTED_SPDM_ENTRIES)
+                       nic->spdm_entry = 0;
+               ret = SUCCESS;
+       } else {
+               DBG_PRINT(ERR_DBG, "SPDM table of %s is not in BAR0!!\n",
+                         dev->name);
+               info->ret = SPDM_TABLE_UNKNOWN_BAR;
+               ret = FAILURE;
+       }
+
+       return ret;
+}
+
+static int spdm_data_processor(struct spdm_cfg *usr_info, struct s2io_nic *sp)
+{
+       int ret;
+       struct swDbgStat *stats = sp->sw_dbg_stat;
+
+       if (sp->device_type == XFRAME_I_DEVICE) {
+               usr_info->ret = SPDM_XENA_IF;
+               return FAILURE;
+       }
+
+       if (!netif_running(sp->dev)) {
+               usr_info->ret = SPDM_HW_UNINITIALIZED;
+               return FAILURE;
+       }
+       if (usr_info->ret == SPDM_GET_CFG_DATA) {/* Retrieve info */
+               u8 *data = kmalloc(MAX_SPDM_ENTRIES_SIZE, GFP_KERNEL);
+               if (!data) {
+                       usr_info->ret = SPDM_TABLE_MALLOC_FAIL;
+                       stats->mem_alloc_fail_cnt++;
+                       return FAILURE;
+               }
+
+               ret = spdm_extract_table(data, sp);
+               if (ret != FAILURE) {
+                       memcpy(usr_info->data, data,
+                               (sp->spdm_entry * 0x40));
+                       usr_info->data_len = ret;
+                       usr_info->ret = SPDM_CONF_SUCCESS;
+                       ret = SUCCESS;
+               } else {
+                       usr_info->ret = SPDM_TABLE_ACCESS_FAILED;
+                       ret = FAILURE;
+               }
+
+               kfree(data);
+               return ret;
+       } else if (usr_info->ret == SPDM_GET_CLR_DATA) {/* Clear info */
+               ret = spdm_clear_table(sp);
+               if (ret != FAILURE) {
+                       usr_info->ret = SPDM_CLR_SUCCESS;
+                       ret = SUCCESS;
+               } else {
+                       usr_info->ret = SPDM_CLR_FAIL;
+                       ret = FAILURE;
+               }
+               return ret;
+       }
+
+       if (!usr_info->dip || !usr_info->sip || !usr_info->sprt ||
+               !usr_info->dprt) {
+               usr_info->ret = SPDM_INCOMPLETE_SOCKET;
+               return FAILURE;
+       }
+
+       ret = spdm_configure(sp, usr_info);
+       if (ret == SUCCESS)
+               usr_info->ret = SPDM_CONF_SUCCESS;
+
+       return SUCCESS;
+}
+
+/* Rx Steering parameter list explanation
+ * rx_steering_type: There are 2 ways to steer Rx'ed frames to correct rings
+ *     on the host either RTH or L4 Port based steering. This parameter can
+ *     be used to choose any one scheme. To use RTH, set this parameter to 2
+ *     or for L4 Port steering set it to 1.
+ *
+ * rth_ports: The specefic ports whicch will be routed to programmed rings. A
+ *     maximum of 'MAX_STEERABLE_PORTS' ports can be configured.
+ *
+ * port_type: This parameter can be used to specify if the ports being
+ *     scanned by the H/W is a Destination port or source port. Default is
+ *     destination port.
+ *
+ * rth_protocol: This parameter can be used to define
+ *             1 is IPV4 Src and dst address and TCP src abd Dst ports
+ *             2 is IPV4 Src and dst address and UDP src abd Dst ports
+ *             3 is IPV4 Src and dst address
+ *             4 is IPV6 Src and dst address and TCP src abd Dst ports
+ *             5 is IPV6 Src and dst address and UDP src abd Dst ports
+ *             6 is IPV6 Src and dst address
+ *             7 is extended IPV6 Src and dst address and TCP src abd Dst
+ *             ports
+ *             8 is extended IPV6 Src and dst address and UDP src abd Dst
+ *             ports
+ *             9 is extended IPV6 Src and dst address
+ * rth_mask: This parameter can be used to mask
+ *             any of the six parameters used for RTH calculation mentioned
+ *             above. The bits 0 to 5 represent IPV4 SA,
+ *             IPV4 DA, IPV6 SA, IPV6 DA, L4 SP, L4 DP in that order.
+ */
+
+S2IO_PARM_INT(port_type, DP);
+static int rth_ports[MAX_STEERABLE_PORTS] =
+                       {[0 ...(MAX_STEERABLE_PORTS - 1)] = 0 };
+#ifdef module_param_array
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10))
+module_param_array(rth_ports, uint, NULL, 0);
+#else
+int num_rth_ports = MAX_STEERABLE_PORTS;
+module_param_array(rth_ports, int, num_rth_ports, 0);
+#endif
+#else
+MODULE_PARM(rth_ports, "1-" __MODULE_STRING(MAX_STEERABLE_PORTS) "i");
+#endif
+
+/**
+ * s2io_rth_configure -
+ */
+int s2io_rth_configure(struct s2io_nic *nic)
+{
+       struct XENA_dev_config *bar0 = (struct XENA_dev_config *) nic->bar0;
+       register u64 val64 = 0;
+       struct config_param *config;
+       int buckets, i, ring = 0, cnt = 0;
+
+       config = &nic->config;
+
+       /* Enabled enhanced RTS steering */
+       val64 = readq(&bar0->rts_ctrl);
+       val64 |= RTS_CTRL_ENHANCED;
+       writeq(val64, &bar0->rts_ctrl);
+
+       if (config->rx_steering_type == PORT_STEERING) {
+               for (i = 0, ring = 0; i < MAX_STEERABLE_PORTS; i++) {
+                       int port = rth_ports[i];
+                       if (!port)
+                               break;
+                       ring = i % config->rx_ring_num;
+                       val64 = S2BIT(7) | vBIT(port, 8, 16) |
+                               vBIT(ring, 37, 3) |  S2BIT(63);
+                       if (port_type == SP)
+                               val64 = S2BIT(47);
+                       writeq(val64, &bar0->rts_pn_cam_data);
+                       val64 = S2BIT(7) | S2BIT(15) | vBIT(i, 24, 8);
+                       writeq(val64, &bar0->rts_pn_cam_ctrl);
+                       mdelay(5);
+               }
+       } else {
+               int rth_sz = 0;
+               int start_ring = 0;
+
+               if (config->rx_steering_type == RTH_STEERING_DEFAULT) {
+                       rth_sz = config->rx_ring_num - 1;
+                       start_ring = 1;
+               } else {
+                       if (rx_ring_num == 0) {
+                               start_ring = 1;
+                               rth_sz = config->rx_ring_num - 1;
+                       } else {
+                               /*
+                                * If the user overrides the driver
+                                * configuration of number of rings then
+                                * include ring zero in the steering criteria
+                                */
+                               rth_sz = config->rx_ring_num;
+                               start_ring = 0;
+                       }
+               }
+
+               ring = start_ring;
+               buckets = 1 << rth_sz;
+
+               for (i = 0; i < buckets; i++) {
+                   val64 = RTS_RTH_MAP_MEM_DATA_ENTRY_EN |
+                               RTS_RTH_MAP_MEM_DATA_(ring);
+                       writeq(val64, &bar0->rts_rth_map_mem_data);
+
+                       val64 = RTS_RTH_MAP_MEM_CTRL_WE |
+                               RTS_RTH_MAP_MEM_CTRL_STROBE |
+                               RTS_RTH_MAP_MEM_CTRL_OFFSET(i);
+                       writeq(val64, &bar0->rts_rth_map_mem_ctrl);
+
+                       do {
+                               val64 = readq(&bar0->rts_rth_map_mem_ctrl);
+                               if (val64 & RTS_RTH_MAP_MEM_CTRL_STROBE) {
+                                       cnt++;
+                                       msleep(10);
+                                       continue;
+                               }
+                               break;
+                       } while (cnt < 5);
+                       if (cnt == 5)
+                               return FAILURE;
+
+                       if (++ring > rth_sz)
+                               ring = start_ring;
+               }
+
+               /*
+                * Mask all parameters as per user's input.
+                */
+               for (i = 0; i < 6; i++) {
+                       if (!((rth_mask >> i) & 0x1))
+                               continue;
+                       switch (i) {
+                       case 0:
+                       val64 = readq(&bar0->rts_rth_hash_mask_n[4]);
+                       val64 |= RTS_RTH_HASH_MASK_IPV4_SA(0xFFFFFFFF);
+                       writeq(val64, &bar0->rts_rth_hash_mask_n[4]);
+                       break;
+                       case 1:
+                               val64 = readq(&bar0->rts_rth_hash_mask_n[4]);
+                               val64 |= RTS_RTH_HASH_MASK_IPV4_DA(0xFFFFFFFF);
+                               writeq(val64, &bar0->rts_rth_hash_mask_n[4]);
+                               break;
+                       case 2:
+                               val64 = 0xFFFFFFFFFFFFFFFFULL;
+                               writeq(val64, &bar0->rts_rth_hash_mask_n[0]);
+                               val64 = 0xFFFFFFFFFFFFFFFFULL;
+                               writeq(val64, &bar0->rts_rth_hash_mask_n[1]);
+                               break;
+                       case 3:
+                               val64 = 0xFFFFFFFFFFFFFFFFULL;
+                               writeq(val64, &bar0->rts_rth_hash_mask_n[2]);
+                               val64 = 0xFFFFFFFFFFFFFFFFULL;
+                               writeq(val64, &bar0->rts_rth_hash_mask_n[3]);
+                               break;
+                       case 4:
+                               val64 = readq(&bar0->rts_rth_hash_mask_5);
+                               val64 |= RTS_RTH_HASH_MASK_L4_SP(0xFFFF);
+                               writeq(val64, &bar0->rts_rth_hash_mask_5);
+                               break;
+                       case 5:
+                               val64 = readq(&bar0->rts_rth_hash_mask_5);
+                               val64 |= RTS_RTH_HASH_MASK_L4_DP(0xFFFF);
+                               writeq(val64, &bar0->rts_rth_hash_mask_5);
+                               break;
+                       }
+               }
+
+               /*
+                * Set the RTH function type as per user's input and enable RTH.
+                */
+               switch (rth_protocol) {
+               case 1:
+                       val64 = RTS_RTH_TCP_IPV4_EN;
+                       break;
+               case 2:
+                       val64 = RTS_RTH_UDP_IPV4_EN;
+                       break;
+               case 3:
+                       val64 = RTS_RTH_IPV4_EN;
+                       break;
+               case 4:
+                       val64 = RTS_RTH_TCP_IPV6_EN;
+                       break;
+               case 5:
+                       val64 = RTS_RTH_UDP_IPV6_EN;
+                       break;
+               case 6:
+                       val64 = RTS_RTH_IPV6_EN;
+                       break;
+               case 7:
+                       val64 = RTS_RTH_TCP_IPV6_EX_EN;
+                       break;
+               case 8:
+                       val64 = RTS_RTH_UDP_IPV6_EX_EN;
+                       break;
+               case 9:
+                       val64 = RTS_RTH_IPV6_EX_EN;
+                       break;
+               default:
+                       val64 = RTS_RTH_TCP_IPV4_EN;
+                       break;
+               }
+               val64 |= RTS_RTH_EN | RTS_RTH_BUCKET_SIZE(rth_sz);
+               writeq(val64, &bar0->rts_rth_cfg);
+       }
+
+       return 0;
+}
+
+#ifndef SET_ETHTOOL_OPS
+/**
+ * s2io_ethtool -to support all ethtool features .
+ * @dev : device pointer.
+ * @ifr :   An IOCTL specefic structure, that can contain a pointer to
+ * a proprietary structure used to pass information to the driver.
+ * Description:
+ * Function used to support all ethtool fatures except dumping Device stats
+ * as it can be obtained from the util tool for now.
+ * Return value:
+ * 0 on success and an appropriate (-)ve integer as defined in errno.h
+ * file on failure.
+ */
+
+static int s2io_ethtool(struct net_device *dev, struct ifreq *rq)
+{
+       struct s2io_nic *sp = dev->priv;
+       void *data = rq->ifr_data;
+       u32 ecmd;
+       u64 val64 = 0;
+       int i;
+#ifdef ETHTOOL_GSTATS
+       int stat_size = 0;
+#endif
+       struct XENA_dev_config __iomem *bar0 = sp->bar0;
+       struct swDbgStat *stats = sp->sw_dbg_stat;
+
+       if (get_user(ecmd, (u32 *) data))
+               return -EFAULT;
+
+       switch (ecmd) {
+       case ETHTOOL_GSET:
+       {
+               struct ethtool_cmd info = { ETHTOOL_GSET };
+               s2io_ethtool_gset(dev, &info);
+               if (copy_to_user(data, &info, sizeof(info)))
+                       return -EFAULT;
+               break;
+       }
+       case ETHTOOL_SSET:
+       {
+               struct ethtool_cmd info;
+
+               if (copy_from_user(&info, data, sizeof(info)))
+                       return -EFAULT;
+               if (s2io_ethtool_sset(dev, &info))
+                       return -EFAULT;
+               break;
+       }
+       case ETHTOOL_GDRVINFO:
+       {
+               struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO };
+
+               s2io_ethtool_gdrvinfo(dev, &info);
+               if (copy_to_user(data, &info, sizeof(info)))
+                       return -EFAULT;
+               break;
+       }
+       case ETHTOOL_GREGS:
+       {
+               struct ethtool_regs regs = { ETHTOOL_GREGS };
+               u8 *reg_space;
+               int ret = 0;
+
+               regs.version = sp->pdev->subsystem_device;
+
+               reg_space = kmalloc(XENA_REG_SPACE, GFP_KERNEL);
+               if (reg_space == NULL) {
+                       DBG_PRINT(ERR_DBG,
+                                 "Memory allocation to dump ");
+                       DBG_PRINT(ERR_DBG, "registers failed\n");
+                       stats->mem_alloc_fail_cnt++;
+                       ret = -EFAULT;
+               }
+               stats->mem_allocated += XENA_REG_SPACE;
+               memset(reg_space, 0, XENA_REG_SPACE);
+               s2io_ethtool_gregs(dev, &regs, reg_space);
+               if (copy_to_user(data, &regs, sizeof(regs))) {
+                       ret = -EFAULT;
+                       goto last_gregs;
+               }
+               data += offsetof(struct ethtool_regs, data);
+               if (copy_to_user(data, reg_space, regs.len)) {
+                       ret = -EFAULT;
+                       goto last_gregs;
+               }
+last_gregs:
+               kfree(reg_space);
+               stats->mem_freed += XENA_REG_SPACE;
+               if (ret)
+                       return ret;
+               break;
+       }
+       case ETHTOOL_GLINK:
+       {
+               struct ethtool_value link = { ETHTOOL_GLINK };
+               link.data = netif_carrier_ok(dev);
+               if (link.data) {
+                       val64 = readq(&bar0->adapter_control);
+                       link.data = (val64 & ADAPTER_CNTL_EN);
+               }
+               if (copy_to_user(data, &link, sizeof(link)))
+                       return -EFAULT;
+               break;
+       }
+       case ETHTOOL_PHYS_ID:
+       {
+               struct ethtool_value id;
+
+               if (copy_from_user(&id, data, sizeof(id)))
+                       return -EFAULT;
+               s2io_ethtool_idnic(dev, id.data);
+               break;
+       }
+       case ETHTOOL_GRINGPARAM:
+       {
+               struct ethtool_ringparam ep =  { ETHTOOL_GRINGPARAM };
+               s2io_ethtool_gringparam(dev, &ep);
+               if (copy_to_user(data, &ep, sizeof(ep)))
+                       return -EFAULT;
+               break;
+       }
+       case ETHTOOL_GPAUSEPARAM:
+       {
+               struct ethtool_pauseparam ep =  { ETHTOOL_GPAUSEPARAM };
+               s2io_ethtool_getpause_data(dev, &ep);
+               if (copy_to_user(data, &ep, sizeof(ep)))
+                       return -EFAULT;
+               break;
+
+       }
+       case ETHTOOL_SPAUSEPARAM:
+       {
+               struct ethtool_pauseparam ep;
+
+               if (copy_from_user(&ep, data, sizeof(ep)))
+                       return -EFAULT;
+               s2io_ethtool_setpause_data(dev, &ep);
+               break;
+       }
+       case ETHTOOL_GRXCSUM:
+       {
+               struct ethtool_value ev = { ETHTOOL_GRXCSUM };
+
+               ev.data = sp->rx_csum;
+               if (copy_to_user(data, &ev, sizeof(ev)))
+                       return -EFAULT;
+               break;
+       }
+       case ETHTOOL_GTXCSUM:
+       {
+               struct ethtool_value ev = { ETHTOOL_GTXCSUM };
+               if (sp->device_type == XFRAME_II_DEVICE)
+                       ev.data = (dev->features & NETIF_F_HW_CSUM);
+               else
+                       ev.data = (dev->features & NETIF_F_IP_CSUM);
+
+               if (copy_to_user(data, &ev, sizeof(ev)))
+                       return -EFAULT;
+               break;
+       }
+       case ETHTOOL_GSG:
+       {
+               struct ethtool_value ev = { ETHTOOL_GSG };
+               ev.data = (dev->features & NETIF_F_SG);
+
+               if (copy_to_user(data, &ev, sizeof(ev)))
+                       return -EFAULT;
+               break;
+       }
+#ifdef NETIF_F_TSO
+       case ETHTOOL_GTSO:
+       {
+               struct ethtool_value ev = { ETHTOOL_GTSO };
+               ev.data = (dev->features & NETIF_F_TSO);
+
+               if (copy_to_user(data, &ev, sizeof(ev)))
+                       return -EFAULT;
+               break;
+       }
+#endif
+       case ETHTOOL_STXCSUM:
+       {
+               struct ethtool_value ev;
+
+               if (copy_from_user(&ev, data, sizeof(ev)))
+                       return -EFAULT;
+
+               if (ev.data) {
+                       if (sp->device_type == XFRAME_II_DEVICE)
+                               dev->features |= NETIF_F_HW_CSUM;
+                       else
+                               dev->features |= NETIF_F_IP_CSUM;
+               } else {
+                       dev->features &= ~NETIF_F_IP_CSUM;
+                       if (sp->device_type == XFRAME_II_DEVICE)
+                               dev->features &= ~NETIF_F_HW_CSUM;
+               }
+               break;
+       }
+       case ETHTOOL_SRXCSUM:
+       {
+               struct ethtool_value ev;
+
+               if (copy_from_user(&ev, data, sizeof(ev)))
+                       return -EFAULT;
+
+               if (ev.data)
+                       sp->rx_csum = 1;
+               else
+                       sp->rx_csum = 0;
+
+               for (i = 0; i < sp->config.rx_ring_num; i++)
+                       sp->mac_control.rings[i].rx_csum = sp->rx_csum;
+               break;
+       }
+       case ETHTOOL_SSG:
+       {
+               struct ethtool_value ev;
+
+               if (copy_from_user(&ev, data, sizeof(ev)))
+                       return -EFAULT;
+
+               if (ev.data)
+                       dev->features |= NETIF_F_SG;
+               else
+                       dev->features &= ~NETIF_F_SG;
+               break;
+       }
+#ifdef NETIF_F_TSO
+       case ETHTOOL_STSO:
+       {
+               struct ethtool_value ev;
+
+               if (copy_from_user(&ev, data, sizeof(ev)))
+                       return -EFAULT;
+
+               if (ev.data)
+                       dev->features |= NETIF_F_TSO;
+               else
+                       dev->features &= ~NETIF_F_TSO;
+               break;
+       }
+#endif
+       case ETHTOOL_GEEPROM:
+       {
+               struct ethtool_eeprom eeprom = { ETHTOOL_GEEPROM };
+               char *data_buf;
+               int ret = 0;
+
+               if (copy_from_user(&eeprom, data, sizeof(eeprom)))
+                       return -EFAULT;
+
+               if (eeprom.len <= 0)
+                       return -EINVAL;
+               data_buf = kmalloc(XENA_EEPROM_SPACE, GFP_KERNEL);
+               if (!data_buf) {
+                       stats->mem_alloc_fail_cnt++;
+                       return -ENOMEM;
+               }
+               stats->mem_allocated +=
+                               XENA_EEPROM_SPACE;
+               s2io_ethtool_geeprom(dev, &eeprom, data_buf);
+
+               if (copy_to_user(data, &eeprom, sizeof(eeprom))) {
+                       ret = -EFAULT;
+                       goto last_geprom;
+               }
+
+               data += offsetof(struct ethtool_eeprom, data);
+
+               if (copy_to_user(data, (void *)data_buf, eeprom.len)) {
+                       ret = -EFAULT;
+                       goto last_geprom;
+               }
+
+last_geprom:
+               kfree(data_buf);
+               stats->mem_freed += XENA_EEPROM_SPACE;
+               if (ret)
+                       return ret;
+               break;
+       }
+       case ETHTOOL_SEEPROM:
+       {
+               struct ethtool_eeprom eeprom;
+               unsigned char *data_buf;
+               void *ptr;
+               int ret = 0;
+
+               if (copy_from_user(&eeprom, data, sizeof(eeprom)))
+                       return -EFAULT;
+
+               data_buf = kmalloc(eeprom.len, GFP_KERNEL);
+               if (!data_buf) {
+                       stats->mem_alloc_fail_cnt++;
+                       return -ENOMEM;
+               }
+
+               stats->mem_allocated += eeprom.len;
+               ptr = (void *) data_buf;
+
+               data += offsetof(struct ethtool_eeprom, data);
+               if (copy_from_user(ptr, data, eeprom.len)) {
+                       ret = -EFAULT;
+                       goto last_seprom;
+               }
+
+               if ((eeprom.offset + eeprom.len) > (XENA_EEPROM_SPACE)) {
+                       DBG_PRINT(ERR_DBG, "%s Write ", dev->name);
+                       DBG_PRINT(ERR_DBG, "request overshoots ");
+                       DBG_PRINT(ERR_DBG, "the EEPROM area\n");
+                       ret = -EFAULT;
+                       goto last_seprom;
+               }
+               if (s2io_ethtool_seeprom(dev, &eeprom, data_buf)) {
+                       ret = -EFAULT;
+                       goto last_seprom;
+               }
+
+last_seprom:
+               kfree(data_buf);
+               stats->mem_freed += eeprom.len;
+               if (ret)
+                       return ret;
+               break;
+       }
+       case ETHTOOL_GSTRINGS:
+       {
+               struct ethtool_gstrings gstrings = { ETHTOOL_GSTRINGS };
+               char *strings = NULL;
+               int ret = 0, mem_sz;
+
+               if (copy_from_user(&gstrings, data, sizeof(gstrings)))
+                       return -EFAULT;
+
+               switch (gstrings.string_set) {
+               case ETH_SS_TEST:
+                       gstrings.len = S2IO_TEST_LEN;
+                       mem_sz = S2IO_STRINGS_LEN;
+                       strings = kmalloc(mem_sz, GFP_KERNEL);
+                       if (!strings) {
+                               stats->mem_alloc_fail_cnt++;
+                               return -ENOMEM;
+                       }
+
+                       memcpy(strings, s2io_gstrings, S2IO_STRINGS_LEN);
+                       break;
+
+#ifdef ETHTOOL_GSTATS
+               case ETH_SS_STATS:
+#ifdef TITAN_LEGACY
+                       if (sp->device_type == TITAN_DEVICE) {
+                               gstrings.len = S2IO_TITAN_STAT_LEN;
+                               mem_sz = S2IO_TITAN_STAT_STRINGS_LEN;
+                               strings = kmalloc(mem_sz, GFP_KERNEL);
+                               if (!strings) {
+                                       stats->mem_alloc_fail_cnt++;
+                                       return -ENOMEM;
+                               }
+                               memcpy(strings,
+                                       &ethtool_titan_stats_keys,
+                                       sizeof(ethtool_titan_stats_keys));
+                       } else
+#endif
+                       {
+                               if (sp->device_type == XFRAME_I_DEVICE) {
+                                       gstrings.len = XFRAME_I_STAT_LEN;
+                                       mem_sz = XFRAME_I_STAT_STRINGS_LEN;
+                               } else {
+                                       gstrings.len = XFRAME_II_STAT_LEN;
+                                       mem_sz = XFRAME_II_STAT_STRINGS_LEN;
+                               }
+                               gstrings.len += (sp->config.tx_fifo_num
+                                       * NUM_TX_SW_STAT * ETH_GSTRING_LEN) +
+                                       (sp->config.rx_ring_num
+                                       * NUM_RX_SW_STAT * ETH_GSTRING_LEN);
+                               mem_sz += (sp->config.tx_fifo_num
+                                       * NUM_TX_SW_STAT * ETH_GSTRING_LEN) +
+                                       (sp->config.rx_ring_num
+                                       * NUM_RX_SW_STAT * ETH_GSTRING_LEN);
+
+                               if (!sp->exec_mode) {
+                                       gstrings.len +=
+                                               S2IO_DRIVER_DBG_STAT_LEN;
+                                       mem_sz += S2IO_DRIVER_DBG_STAT_LEN *
+                                                       ETH_GSTRING_LEN;
+                               }
+
+                               strings = kmalloc(mem_sz, GFP_KERNEL);
+                               if (!strings) {
+                                       stats->mem_alloc_fail_cnt++;
+                                       return -ENOMEM;
+                               }
+
+                               stat_size = sizeof(ethtool_xena_stats_keys);
+                               memcpy(strings,
+                                       &ethtool_xena_stats_keys, stat_size);
+
+                               if (sp->device_type == XFRAME_II_DEVICE) {
+                                       memcpy(strings + stat_size,
+                                       &ethtool_enhanced_stats_keys,
+                                       sizeof(ethtool_enhanced_stats_keys));
+
+                                       stat_size +=
+                                          sizeof(ethtool_enhanced_stats_keys);
+                               }
+
+                               memcpy(strings + stat_size,
+                                       &ethtool_driver_stats_keys,
+                                       sizeof(ethtool_driver_stats_keys));
+
+                               if (!sp->exec_mode) {
+                                       stat_size += sizeof(ethtool_driver_stats_keys);
+                                       memcpy(strings + stat_size,
+                                               &ethtool_driver_dbg_stats_keys,
+                                               sizeof(ethtool_driver_dbg_stats_keys));
+                               }
+
+                               }
+                       break;
+#endif
+               default:
+                       return -EOPNOTSUPP;
+               }
+
+               if (copy_to_user(data, &gstrings, sizeof(gstrings)))
+                       ret = -EFAULT;
+               if (!ret) {
+                       data +=
+                       offsetof(struct ethtool_gstrings,
+                                    data);
+                       if (copy_to_user(data, strings, mem_sz))
+                               ret = -EFAULT;
+               }
+               kfree(strings);
+               if (ret)
+                       return ret;
+               break;
+       }
+       case ETHTOOL_TEST:
+       {
+               struct {
+                       struct ethtool_test ethtest;
+                       uint64_t data[S2IO_TEST_LEN];
+               } test = { {ETHTOOL_TEST} };
+
+               if (copy_from_user(&test.ethtest, data, sizeof(test.ethtest)))
+                       return -EFAULT;
+
+               s2io_ethtool_test(dev, &test.ethtest, test.data);
+               if (copy_to_user(data, &test, sizeof(test)))
+                       return -EFAULT;
+
+               break;
+       }
+#ifdef ETHTOOL_GSTATS
+       case ETHTOOL_GSTATS:
+       {
+               struct ethtool_stats eth_stats;
+               int ret;
+               u64 *stat_mem;
+
+               if (copy_from_user(&eth_stats, data, sizeof(eth_stats)))
+                       return -EFAULT;
+#ifdef TITAN_LEGACY
+               if (sp->device_type == TITAN_DEVICE)
+                       eth_stats.n_stats = S2IO_TITAN_STAT_LEN;
+               else
+#endif
+               {
+                       if (sp->device_type == XFRAME_I_DEVICE)
+                               eth_stats.n_stats += XFRAME_I_STAT_LEN +
+                               (sp->config.tx_fifo_num * NUM_TX_SW_STAT) +
+                               (sp->config.rx_ring_num * NUM_RX_SW_STAT);
+                       else
+                               eth_stats.n_stats += XFRAME_II_STAT_LEN +
+                               (sp->config.tx_fifo_num * NUM_TX_SW_STAT) +
+                               (sp->config.rx_ring_num * NUM_RX_SW_STAT);
+
+                       if (!sp->exec_mode)
+                               eth_stats.n_stats += S2IO_DRIVER_DBG_STAT_LEN;
+               }
+
+               stat_mem =
+               kmalloc(eth_stats.n_stats * sizeof(u64), GFP_USER);
+               if (!stat_mem) {
+                       stats->mem_alloc_fail_cnt++;
+                       return -ENOMEM;
+               }
+               stats->mem_allocated +=
+                       (eth_stats.n_stats * sizeof(u64));
+               s2io_get_ethtool_stats(dev, &eth_stats, stat_mem);
+               ret = 0;
+               if (copy_to_user(data, &eth_stats, sizeof(eth_stats)))
+                       ret = -EFAULT;
+               data += sizeof(eth_stats);
+               if (copy_to_user(data, stat_mem,
+                               eth_stats.n_stats * sizeof(u64)))
+                       ret = -EFAULT;
+               kfree(stat_mem);
+               stats->mem_freed += (eth_stats.n_stats * sizeof(u64));
+               return ret;
+       }
+#endif
+
+       default:
+               return -EOPNOTSUPP;
+       }
+
+       return 0;
+}
+#endif
+
+#ifdef SNMP_SUPPORT
+int s2io_snmp_init(struct s2io_nic *nic)
+{
+       struct net_device *dev = nic->dev;
+       struct timeval tm;
+       if (!s2io_bdsnmp_init(dev))
+               DBG_PRINT(INIT_DBG, "Error Creating Proc directory for SNMP\n");
+
+       do_gettimeofday(&tm);
+       nic->lDate = tm.tv_sec;
+       return 0;
+}
+
+int s2io_snmp_exit(struct s2io_nic *nic)
+{
+       struct net_device *dev = nic->dev;
+       s2io_bdsnmp_rem(dev);
+       return 0;
+}
+
+/**
+ * fnBaseDrv - Get the driver information
+ * @pBaseDrv -Pointer to Base driver structure which contains the offset
+ * and length of each of the field.
+ * Description
+ * This function copies the driver specific information from the dev structure
+ * to the pBaseDrv stucture. It calculates the number of physical adapters by
+ * parsing the dev_base global variable maintained by the kernel. This
+ * variable has to read locked before accesing.This function is called by
+ * fnBaseReadProc function.
+ *
+ */
+
+static void fnBaseDrv(struct stBaseDrv *pBaseDrv, struct net_device *dev)
+{
+
+       struct pci_dev *pdev = NULL;
+       struct net_device *ndev;
+       struct s2io_nic *sp = dev->priv;
+       struct XENA_dev_config __iomem *bar0 = sp->bar0;
+       int nCount = 0;
+       int i;
+       struct swDbgStat *stats = sp->sw_dbg_stat;
+
+       strncpy(pBaseDrv->m_cName, sp->cName, 20);
+       strncpy(pBaseDrv->m_cVersion, sp->cVersion, 20);
+       pBaseDrv->m_nStatus = sp->last_link_state;
+       pBaseDrv->m_nMemorySize = stats->mem_allocated;
+       sprintf(pBaseDrv->m_cDate, "%ld", sp->lDate);
+       pBaseDrv->m_dev_id = sp->pdev->device;
+       pBaseDrv->m_ven_id = PCI_VENDOR_ID_S2IO;
+       pBaseDrv->m_tx_intr_cnt = sp->tx_intr_cnt;
+       pBaseDrv->m_rx_intr_cnt = sp->rx_intr_cnt;
+       pBaseDrv->m_intr_type = sp->config.intr_type;
+       pBaseDrv->m_tx_fifo_num = sp->config.tx_fifo_num;
+       pBaseDrv->m_rx_ring_num = sp->config.rx_ring_num;
+       pBaseDrv->m_rxd_mode = sp->rxd_mode;
+       pBaseDrv->m_lro = sp->lro;
+       pBaseDrv->m_lro_max_pkts = sp->lro_max_aggr_per_sess;
+       pBaseDrv->m_napi = sp->config.napi;
+       pBaseDrv->m_rx_steering_type = sp->config.rx_steering_type;
+       pBaseDrv->m_vlan_tag_strip = sp->config.vlan_tag_strip;
+       pBaseDrv->m_rx_csum = sp->rx_csum;
+       if (sp->device_type == XFRAME_II_DEVICE)
+               pBaseDrv->m_tx_csum = ((dev->features & NETIF_F_HW_CSUM)? 1: 0);
+       else
+               pBaseDrv->m_tx_csum = ((dev->features & NETIF_F_IP_CSUM)? 1: 0);
+       pBaseDrv->m_sg = ((dev->features & NETIF_F_SG)?1:0);
+#ifndef NETIF_F_UFO
+       pBaseDrv->m_ufo = 0;
+#else
+       pBaseDrv->m_ufo = 0;
+       if ((sp->device_type == XFRAME_II_DEVICE) && ufo)
+               pBaseDrv->m_ufo = 1;
+#endif
+#ifndef NETIF_F_TSO
+       pBaseDrv->m_tso = 0;
+#else
+       pBaseDrv->m_tso = 1;
+#endif
+       pBaseDrv->m_nFeature = ((pBaseDrv->m_tx_csum && sp->rx_csum &&
+                               pBaseDrv->m_tso)?3:((pBaseDrv->m_tso)?1:0));
+       pBaseDrv->m_fifo_len = 0;
+       for (i = 0; i < sp->config.tx_fifo_num; i++)
+               pBaseDrv->m_fifo_len += sp->config.tx_cfg[i].fifo_len;
+       pBaseDrv->m_rx_ring_size = 0;
+       for (i = 0; i < sp->config.rx_ring_num; i++)
+               pBaseDrv->m_rx_ring_size += rx_ring_sz[i];
+       pBaseDrv->m_rth_bucket_size = ((sp->config.rx_ring_num + 1)/2);
+       pBaseDrv->m_tx_urng = readq(&bar0->tti_data1_mem);
+       pBaseDrv->m_rx_urng = readq(&bar0->rti_data1_mem);
+       pBaseDrv->m_tx_ufc  = readq(&bar0->tti_data2_mem);
+       pBaseDrv->m_rx_ufc  = readq(&bar0->rti_data2_mem);
+       /*
+        * Find all the ethernet devices on the system using
+        * pci_find_device. Get the private data which will be the
+        * net_device structure assigned by the driver.
+        */
+       while ((pdev =
+               S2IO_PCI_FIND_DEVICE(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
+               if (pdev->vendor == PCI_VENDOR_ID_S2IO) {
+                       ndev = (struct net_device *) pci_get_drvdata(pdev);
+                       if (ndev == NULL)
+                               continue;
+                       memcpy(pBaseDrv->m_stPhyAdap[nCount].m_cName,
+                               ndev->name, 20);
+                       pBaseDrv->m_stPhyAdap[nCount].m_nIndex = ndev->ifindex;
+                       nCount++;
+               }
+       }
+       pBaseDrv->m_nPhyCnt = nCount;
+}
+
+/*
+*  fnBaseReadProc - Read entry point for the proc file
+*  @page - Buffer pointer where the data is written
+*  @start- Pointer to buffer ptr . It is used if the data is more than a page
+*  @off- the offset to the page where data is written
+*  @count - number of bytes to write
+*  @eof - to indicate end of file
+*  @data - pointer to device structure.
+*
+* Description -
+* This function gets  Base driver specific information from the fnBaseDrv
+* function and writes into the BDInfo file. This function is called whenever
+* the user reads the file. The length of data written cannot exceed 4kb.
+* If it exceeds then use the start pointer to write multiple pages
+* Return - the length of the string written to proc file
+*/
+static int fnBaseReadProc(char *page, char **start, off_t off, int count,
+                         int *eof, void *data)
+{
+       struct stBaseDrv *pBaseDrv;
+       int nLength = 0;
+       int nCount = 0;
+       struct net_device *dev = (struct net_device *) data;
+       int nIndex = 0;
+
+       pBaseDrv = kmalloc(sizeof(struct stBaseDrv), GFP_KERNEL);
+       if (pBaseDrv == NULL) {
+               DBG_PRINT(ERR_DBG, "Error allocating memory\n");
+               return -ENOMEM;
+       }
+       fnBaseDrv(pBaseDrv, dev);
+       sprintf(page + nLength, "%-30s%-20s\n", "Base Driver Name",
+               pBaseDrv->m_cName);
+       nLength += 51;
+       if (pBaseDrv->m_nStatus == 2)
+               sprintf(page + nLength, "%-30s%-20s\n", "Load Status",
+                       "Loaded");
+       else
+               sprintf(page + nLength, "%-30s%-20s\n", "Load Status",
+                       "UnLoaded");
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20s\n", "Base Driver Version",
+               pBaseDrv->m_cVersion);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20d\n", "Feature Supported",
+               pBaseDrv->m_nFeature);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20lld\n",
+               "Base Driver Memrory in Bytes", pBaseDrv->m_nMemorySize);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20s\n", "Base Driver Date",
+               pBaseDrv->m_cDate);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20d\n", "No of Phy Adapter",
+               pBaseDrv->m_nPhyCnt);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20x\n", "Device id",
+               pBaseDrv->m_dev_id);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20x\n", "Vendor id",
+               pBaseDrv->m_ven_id);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20d\n", "Tx Interrupt Count",
+               pBaseDrv->m_tx_intr_cnt);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20d\n", "Rx Interrupt Count",
+               pBaseDrv->m_rx_intr_cnt);
+       nLength += 51;
+       if (pBaseDrv->m_intr_type == 0)
+               sprintf(page + nLength, "%-30s%-20s\n", "Interrupt Type",
+                       "INTA");
+       else
+               sprintf(page + nLength, "%-30s%-20s\n", "Interrupt Type",
+                       "MSI-X");
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20d\n", "FIFOs Configured",
+               pBaseDrv->m_tx_fifo_num);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20d\n", "Rings Configured",
+               pBaseDrv->m_rx_ring_num);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20d\n", "Fifo Length",
+               pBaseDrv->m_fifo_len);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20d\n", "Rx Ring Size",
+               pBaseDrv->m_rx_ring_size);
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20d\n", "Rth Bucket Size",
+               pBaseDrv->m_rth_bucket_size);
+       nLength += 51;
+       if (pBaseDrv->m_rxd_mode == 0)
+               sprintf(page + nLength, "%-30s%-20s\n", "Rx Buffer Mode",
+                       "1-buffer mode");
+       else if (pBaseDrv->m_rxd_mode == 1)
+               sprintf(page + nLength, "%-30s%-20s\n", "Rx Buffer Mode",
+                       "2-buffer mode");
+       else
+               sprintf(page + nLength, "%-30s%-20s\n", "Rx Buffer Mode",
+                       "5-buffer mode");
+       nLength += 51;
+       if (pBaseDrv->m_lro == 1)
+               sprintf(page + nLength, "%-30s%-20s\n", "LRO",
+                       "LRO ENABLED");
+       else
+               sprintf(page + nLength, "%-30s%-20s\n", "LRO",
+                       "LRO DISABLED");
+       nLength += 51;
+       sprintf(page + nLength, "%-30s%-20d\n", "LRO Max Packets",
+               pBaseDrv->m_lro_max_pkts);
+       nLength += 51;
+       if (pBaseDrv->m_napi == 1)
+               sprintf(page + nLength, "%-30s%-20s\n", "NAPI",
+                       "NAPI ENABLED");
+       else
+               sprintf(page + nLength, "%-30s%-20s\n", "NAPI",
+                       "NAPI DISABLED");
+       nLength += 51;
+       if (pBaseDrv->m_ufo == 1)
+               sprintf(page + nLength, "%-30s%-20s\n", "UFO",
+                       "UFO ENABLED");
+       else
+               sprintf(page + nLength, "%-30s%-20s\n", "UFO",
+                       "UFO DISABLED");
+       nLength += 51;
+       if (pBaseDrv->m_tso == 1)
+               sprintf(page + nLength, "%-30s%-20s\n", "TSO",
+                       "TSO ENABLED");
+       else
+               sprintf(page + nLength, "%-30s%-20s\n", "TSO",
+                       "TSO DISABLED");
+       nLength += 51;
+       if (pBaseDrv->m_rx_steering_type == 0)
+               sprintf(page + nLength, "%-30s%-20s\n", "Rx Steering Type",
+                       "NO STEERING");
+       else if (pBaseDrv->m_rx_steering_type == 1)
+               sprintf(page + nLength, "%-30s%-20s\n", "Rx Steering Type",
+                       "PORT STEERING");
+       else
+               sprintf(page + nLength, "%-30s%-20s\n", "Rx Steering Type",
+                       "RTH ENABLED");
+       nLength += 51;
+       if (pBaseDrv->m_vlan_tag_strip == 0)
+               sprintf(page + nLength, "%-30s%-20s\n", "VLAN Tag Stripping",
+                       "DISABLED");
+       else if (pBaseDrv->m_vlan_tag_strip == 1)
+               sprintf(page + nLength, "%-30s%-20s\n", "VLAN Tag Stripping",
+                       "ENABLED");
+       else
+               sprintf(page + nLength, "%-30s%-23s\n", "VLAN Tag Stripping",
+                       "DEFAULT MODE");
+       nLength += 55;
+       if (pBaseDrv->m_rx_csum == 1)
+               sprintf(page + nLength, "%-30s%-20s\n", "Rx Checksum",
+                       "RX CSUM ENABLED");
+       else
+               sprintf(page + nLength, "%-30s%-20s\n", "Rx Checksum",
+                       "RX CSUM DISABLED");
+       nLength += 51;
+       if (pBaseDrv->m_tx_csum == 1)
+               sprintf(page + nLength, "%-30s%-20s\n", "Tx Checksum",
+                       "TX CSUM ENABLED");
+       else
+               sprintf(page + nLength, "%-30s%-20s\n", "Tx Checksum",
+                       "TX CSUM DISABLED");
+       nLength += 51;
+       if (pBaseDrv->m_sg == 1)
+               sprintf(page + nLength, "%-30s%-20s\n", "Scatter Gather",
+                       "SG ENABLED");
+       else
+               sprintf(page + nLength, "%-30s%-20s\n", "Scatter Gather",
+                       "SG DISABLED");
+       nLength += 51;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "TX_URNG_A",
+               ((unsigned long long)(0x7F0000 & pBaseDrv->m_tx_urng) >> 16));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "TX_URNG_B",
+               ((unsigned long long)(0x7F00 & pBaseDrv->m_tx_urng) >> 8));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "TX_URNG_C",
+               (unsigned long long)(0x7F & pBaseDrv->m_tx_urng));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "RX_URNG_A",
+               ((unsigned long long)(0x7F0000 & pBaseDrv->m_rx_urng) >> 16));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "RX_URNG_B",
+               ((unsigned long long)(0x7F00 & pBaseDrv->m_rx_urng) >> 8));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "RX_URNG_C",
+               (unsigned long long)(0x7F & pBaseDrv->m_rx_urng));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "TX_UFC_A",
+               ((unsigned long long)
+                       (0xFFFF000000000000ULL & pBaseDrv->m_tx_ufc) >> 48));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "TX_UFC_B",
+               ((unsigned long long)
+                       (0xFFFF00000000ULL & pBaseDrv->m_tx_ufc) >> 32));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "TX_UFC_C",
+               ((unsigned long long)(0xFFFF0000 & pBaseDrv->m_tx_ufc) >> 16));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "TX_UFC_D",
+               (unsigned long long)(0xFFFF & pBaseDrv->m_tx_ufc));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "RX_UFC_A",
+               ((unsigned long long)
+                       (0xFFFF000000000000ULL & pBaseDrv->m_rx_ufc) >> 48));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "RX_UFC_B",
+               ((unsigned long long)
+                       (0xFFFF00000000ULL & pBaseDrv->m_rx_ufc) >> 32));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "RX_UFC_C",
+               ((unsigned long long)(0xFFFF0000 & pBaseDrv->m_rx_ufc) >> 16));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s0x%-20llx\n", "RX_UFC_D",
+               (unsigned long long)(0xFFFF & pBaseDrv->m_rx_ufc));
+       nLength += 53;
+       sprintf(page + nLength, "%-30s%-20s\n\n", "Phy Adapter Index",
+               "Phy Adapter Name");
+       nLength += 42;
+       for (nIndex = 0, nCount = pBaseDrv->m_nPhyCnt; nCount != 0;
+               nCount--, nIndex++) {
+               sprintf(page + nLength, "%-20d%-20s\n",
+                       pBaseDrv->m_stPhyAdap[nIndex].m_nIndex,
+                       pBaseDrv->m_stPhyAdap[nIndex].m_cName);
+               nLength += 41;
+       }
+
+       *eof = 1;
+       kfree(pBaseDrv);
+       return nLength;
+}
+
+/*
+ *  fnPhyAdapReadProc - Read entry point for the proc file
+ *  @page - Buffer pointer where the data is written
+ *  @start- Pointer to buffer ptr . It is used if the data is more than a page
+ *  @off- the offset to the page where data is written
+ *  @count - number of bytes to write
+ *  @eof - to indicate end of file
+ *  @data - pointer to device structure.
+ *
+ * Description -
+ * This function gets  physical adapter information. This function is called
+ * whenever the user reads the file. The length of data written cannot
+ * exceed 4kb. If it exceeds then use the start pointer to write multiple page
+ *
+ * Return - the length of the string written to proc file
+ */
+static int fnPhyAdapReadProc(char *page, char **start, off_t off,
+                            int count, int *eof, void *data)
+{
+
+       struct stPhyData *pPhyData;
+       struct net_device *pNetDev = (struct net_device *) data;
+       struct s2io_nic *sp = pNetDev->priv;
+       struct net_device_stats *pNetStat;
+       struct pci_dev *pdev = NULL;
+       int nLength = 0;
+       u64 pmaddr;
+       unsigned char cMAC[20];
+       unsigned char pMAC[20];
+       pPhyData = kmalloc(sizeof(struct stPhyData), GFP_KERNEL);
+       if (pPhyData == NULL) {
+               DBG_PRINT(ERR_DBG, "Error allocating memory\n");
+               return -ENOMEM;
+       }
+
+       /* Print the header in the PhyAdap proc file */
+       sprintf(page + nLength,
+               "%-10s%-22s%-10s%-10s%-22s%-22s%-22s%-10s%-10s%-10s%-10s%-10s"
+               "%-10s%-10s%-10s%-10s%-10s%-10s%-10s%-10s%-10s\n",
+               "Index", "Description", "Mode", "Type", "Speed", "PMAC", "CMAC",
+               "Status", "Slot", "Bus", "IRQ", "Colis", "Multi",
+               "RxBytes", "RxDrop", "RxError", "RxPacket", "TRxBytes",
+               "TRxDrop", "TxError", "TxPacket");
+
+       /* 259 is the lenght of the above string copied in the page  */
+       nLength += 259;
+
+       while ((pdev =
+               S2IO_PCI_FIND_DEVICE(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
+               if (pdev->vendor == PCI_VENDOR_ID_S2IO) {
+                       /* Private data will point to the netdevice structure */
+                       pNetDev = (struct net_device *) pci_get_drvdata(pdev);
+                       if (pNetDev == NULL)
+                               continue;
+                       if (pNetDev->addr_len != 0) {
+                               pNetStat = pNetDev->get_stats(pNetDev);
+                               pPhyData->m_nIndex = pNetDev->ifindex;
+                               memcpy(pPhyData->m_cDesc, pNetDev->name, 20);
+                               pPhyData->m_nMode = 0;
+                               pPhyData->m_nType = 0;
+                               switch (pPhyData->m_nType) {
+                               /*
+                               case IFT_ETHER:
+                                       memcpy(pPhyData->m_cSpeed,
+                                               "10000000",20);
+                                       break;
+
+                               case 9:
+                                       memcpy(pPhyData->m_cSpeed,
+                                               "4000000",20);
+                                       break;
+                                */
+                               default:
+                                       memcpy(pPhyData->m_cSpeed,
+                                               "10000000", 20);
+                                       break;
+                               }
+                               pmaddr = do_s2io_read_unicast_mc(sp, 0);
+                               memcpy(pPhyData->m_cPMAC, &pmaddr,
+                                       ETH_ALEN);
+                               memcpy(pPhyData->m_cCMAC, pNetDev->dev_addr,
+                                       ETH_ALEN);
+                               pPhyData->m_nLinkStatus =
+                                       test_bit(__LINK_STATE_START,
+                                               &pNetDev->state);
+                               pPhyData->m_nPCISlot = PCI_SLOT(pdev->devfn);
+                               pPhyData->m_nPCIBus = pdev->bus->number;
+                               pPhyData->m_nIRQ = pNetDev->irq;
+                               pPhyData->m_nCollision = pNetStat->collisions;
+                               pPhyData->m_nMulticast = pNetStat->multicast;
+
+                               pPhyData->m_nRxBytes = pNetStat->rx_bytes;
+                               pPhyData->m_nRxDropped = pNetStat->rx_dropped;
+                               pPhyData->m_nRxErrors = pNetStat->rx_errors;
+                               pPhyData->m_nRxPackets = pNetStat->rx_packets;
+
+                               pPhyData->m_nTxBytes = pNetStat->tx_bytes;
+                               pPhyData->m_nTxDropped = pNetStat->tx_dropped;
+                               pPhyData->m_nTxErrors = pNetStat->tx_errors;
+                               pPhyData->m_nTxPackets = pNetStat->tx_packets;
+
+                               sprintf(cMAC, "%02x:%02x:%02x:%02x:%02x:%02x",
+                                       pPhyData->m_cCMAC[0],
+                                       pPhyData->m_cCMAC[1],
+                                       pPhyData->m_cCMAC[2],
+                                       pPhyData->m_cCMAC[3],
+                                       pPhyData->m_cCMAC[4],
+                                       pPhyData->m_cCMAC[5]);
+
+                               sprintf(pMAC, "%02x:%02x:%02x:%02x:%02x:%02x",
+                                       pPhyData->m_cPMAC[5],
+                                       pPhyData->m_cPMAC[4],
+                                       pPhyData->m_cPMAC[3],
+                                       pPhyData->m_cPMAC[2],
+                                       pPhyData->m_cPMAC[1],
+                                       pPhyData->m_cPMAC[0]);
+
+                               sprintf(page + nLength,
+                                       "%-10d%-22s%-10d%-10d%-22s%-22s%-22s"
+                                       "%-10d%-10d%-10d%-10d%-10d%-10d%-10lld"
+                                       "%-10lld%-10lld%-10lld%-10lld%-10lld"
+                                       "%-10lld%-10lld\n",
+                               pPhyData->m_nIndex, pPhyData->m_cDesc,
+                               pPhyData->m_nMode, pPhyData->m_nType,
+                               pPhyData->m_cSpeed, pMAC, cMAC,
+                               pPhyData->m_nLinkStatus,
+                               pPhyData->m_nPCISlot, pPhyData->m_nPCIBus,
+                               pPhyData->m_nIRQ, pPhyData->m_nCollision,
+                               pPhyData->m_nMulticast,
+                               pPhyData->m_nRxBytes,
+                               pPhyData->m_nRxDropped,
+                               pPhyData->m_nRxErrors,
+                               pPhyData->m_nRxPackets,
+                               pPhyData->m_nTxBytes,
+                               pPhyData->m_nTxDropped,
+                               pPhyData->m_nTxErrors,
+                               pPhyData->m_nTxPackets);
+                               nLength += 259;
+                       }
+               }
+       }
+       *eof = 1;
+       kfree(pPhyData);
+       return nLength;
+}
+
+/*
+ * s2io_bdsnmp_init - Entry point to create proc file
+ * @dev-  Pointer to net device structure passed by the driver.
+ * Return
+ * Success If creates all the files
+ * ERROR_PROC_ENTRY /ERROR_PROC_DIR Error If could not create all the files
+ * Description
+ * This functon is called when the driver is loaded. It creates the S2IO
+ * proc file system in the /proc/net/ directory. This directory is used to
+ * store the info about the base driver afm driver, lacp, vlan  and nplus.
+ * It checks if S2IO directory already exists else creates it and creates
+ * the files BDInfo  files and assiciates read function to each of the files.
+ */
+
+int s2io_bdsnmp_init(struct net_device *dev)
+{
+       struct proc_dir_entry *S2ioDir;
+       struct proc_dir_entry *BaseDrv;
+       struct proc_dir_entry *PhyAdap;
+       int nLength = 0;
+
+       nLength = strlen(S2IODIRNAME);
+       /* IF the directory already exists then just return */
+       for (S2ioDir = proc_net->subdir; S2ioDir != NULL;
+               S2ioDir = S2ioDir->next) {
+               if ((S2ioDir->namelen == nLength)
+                       && (!memcmp(S2ioDir->name, S2IODIRNAME, nLength)))
+                       break;
+       }
+       if (S2ioDir == NULL)
+               /* Create the s2io directory */
+               if (!(S2ioDir =
+                       create_proc_entry(S2IODIRNAME, S_IFDIR, proc_net))) {
+                       DBG_PRINT(INIT_DBG,
+                               "Error Creating Proc directory for SNMP\n");
+                       return ERROR_PROC_DIR;
+               }
+       /* Create the BDInfo file to store driver info and associate
+       * read funtion
+       */
+       if (!(BaseDrv =
+               create_proc_read_entry(BDFILENAME, S_IFREG | S_IRUSR, S2ioDir,
+                       fnBaseReadProc, (void *) dev))) {
+               DBG_PRINT(INIT_DBG, "Error Creating Proc File for Base Drvr\n");
+               return ERROR_PROC_ENTRY;
+       }
+       if (!(PhyAdap =
+               create_proc_read_entry(PADAPFILENAME, S_IFREG | S_IRUSR,
+                       S2ioDir, fnPhyAdapReadProc, (void *) dev))) {
+               DBG_PRINT(INIT_DBG, "Error Creating Proc File for Phys Adap\n");
+               return ERROR_PROC_ENTRY;
+       }
+
+
+       return SUCCESS;
+}
+
+/**
+ * s2io_bdsnmp_rem : Removes the proc file entry
+ * @dev - pointer to netdevice structre
+ * Return - void
+ * Description
+ * This functon is called when the driver is Unloaded. It checks if the
+ * S2IO directoy exists and deletes the files in the reverse order of
+ * creation.
+ */
+
+void s2io_bdsnmp_rem(struct net_device *dev)
+{
+       int nLength = 0;
+       struct proc_dir_entry *S2ioDir;
+       nLength = strlen(S2IODIRNAME);
+       /*
+       * Check if the S2IO directory exists or not and then delete
+       * all the files in the S2IO Directory
+       */
+       for (S2ioDir = proc_net->subdir; S2ioDir != NULL;
+               S2ioDir = S2ioDir->next) {
+                       if ((S2ioDir->namelen == nLength)
+                               && (!memcmp(S2ioDir->name, S2IODIRNAME,
+                                       nLength)))
+                       break;
+       }
+       if (S2ioDir == NULL)
+               return;
+       remove_proc_entry(BDFILENAME, S2ioDir);
+       remove_proc_entry(PADAPFILENAME, S2ioDir);
+       if (S2ioDir->subdir == NULL)
+               remove_proc_entry(S2IODIRNAME, proc_net);
+}
+#endif
+/*
+ *  To build the driver,
+ * gcc -D__KERNEL__ -DMODULE -I/usr/src/linux-2.4/include -Wall
+ * -Wstrict-prototypes -O2 -c s2io.c
+ */
index 6722a2f7d0912c93b0b338b0536439521362ef22..797813606cb27a986f2865c77280d541ef8e1c6c 100644 (file)
@@ -1,20 +1,19 @@
-/************************************************************************
- * s2io.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC
- * Copyright(c) 2002-2007 Neterion Inc.
-
- * This software may be used and distributed according to the terms of
- * the GNU General Public License (GPL), incorporated herein by reference.
- * Drivers based on or derived from this code fall under the GPL and must
- * retain the authorship, copyright and license notice.  This file is not
- * a complete program and may only be used when the entire operating
- * system is licensed under the GPL.
- * See the file COPYING in this distribution for more information.
- ************************************************************************/
+/***************************************************************************
+ * s2io.h: A Linux PCI-X Ethernet driver for Neterion 10GbE Server NIC     *
+ * Copyright(c) 2002-2005 Neterion Inc.                                    *
+ * This software may be used and distributed according to the terms of     *
+ * the GNU General Public License (GPL), incorporated herein by reference. *
+ * Drivers based on or derived from this code fall under the GPL and must  *
+ * retain the authorship, copyright and license notice.  This file is not  *
+ * a complete program and may only be used when the entire operating       *
+ * system is licensed under the GPL.                                       *
+ * See the file COPYING in this distribution for more information.         *
+ ***************************************************************************/
 #ifndef _S2IO_H
 #define _S2IO_H
 
 #define TBD 0
-#define s2BIT(loc)             (0x8000000000000000ULL >> (loc))
+#define S2BIT(loc)             (0x8000000000000000ULL >> (loc))
 #define vBIT(val, loc, sz)     (((u64)val) << (64-loc-sz))
 #define INV(d)  ((d&0xff)<<24) | (((d>>8)&0xff)<<16) | (((d>>16)&0xff)<<8)| ((d>>24)&0xff)
 
 #undef SUCCESS
 #define SUCCESS 0
 #define FAILURE -1
-#define S2IO_MINUS_ONE 0xFFFFFFFFFFFFFFFFULL
-#define S2IO_DISABLE_MAC_ENTRY 0xFFFFFFFFFFFFULL
-#define S2IO_MAX_PCI_CONFIG_SPACE_REINIT 100
 #define S2IO_BIT_RESET 1
 #define S2IO_BIT_SET 2
+
+/* Macro to added SNMP support in Driver */
+#define SNMP_SUPPORT
+
+#define S2IO_MINUS_ONE 0xFFFFFFFFFFFFFFFFULL
+#define S2IO_DISABLE_MAC_ENTRY 0xFFFFFFFFFFFFULL
+#define S2IO_32_BIT_MINUS_ONE 0xFFFFFFFFULL
+#define S2IO_MAX_PCI_CONFIG_SPACE_REINIT 100
+#define S2IO_WAIT_FOR_RESET_MAX 25
+
 #define CHECKBIT(value, nbit) (value & (1 << nbit))
 
 /* Maximum time to flicker LED when asked to identify NIC using ethtool */
 #define MAX_FLICKER_TIME       60000 /* 60 Secs */
 
+/* Buffer size for 5 buffer mode */
+#define MODE5_BUF_SIZE \
+       (PAGE_SIZE - sizeof(struct skb_shared_info) - 64 - ALIGN_SIZE)
+
 /* Maximum outstanding splits to be configured into xena. */
 enum {
        XENA_ONE_SPLIT_TRANSACTION = 0,
@@ -55,9 +65,12 @@ enum {
 
 /*  OS concerned variables and constants */
 #define WATCH_DOG_TIMEOUT              15*HZ
-#define EFILL                          0x1234
-#define ALIGN_SIZE                     127
-#define        PCIX_COMMAND_REGISTER           0x62
+#define ALIGN_SIZE                             127
+#define        PCIX_COMMAND_REGISTER   0x62
+
+#ifndef SET_ETHTOOL_OPS
+#define SUPPORTED_10000baseT_Full (1 << 12)
+#endif
 
 /*
  * Debug related variables.
@@ -70,7 +83,7 @@ enum {
 #define        INTR_DBG        4
 
 /* Global variable that defines the present debug level of the driver. */
-static int debug_level = ERR_DBG;
+static int debug_level = ERR_DBG;      /* Default level. */
 
 /* DEBUG message print. */
 #define DBG_PRINT(dbg_level, args...)  if(!(debug_level<dbg_level)) printk(args)
@@ -78,51 +91,31 @@ static int debug_level = ERR_DBG;
 /* Protocol assist features of the NIC */
 #define L3_CKSUM_OK 0xFFFF
 #define L4_CKSUM_OK 0xFFFF
-#define S2IO_JUMBO_SIZE 9600
+
+#ifdef TITAN_LEGACY
+/*TITAN statistics*/
+#define MAC_LINKS       3
+#define MAC_AGGREGATORS 2
+#define LINK_MAX        91
+#define AGGR_MAX        12
+#endif
+
+/* Number of receive and transmit s/w statistics*/
+#define NUM_RX_SW_STAT 21
+#define NUM_TX_SW_STAT 6
 
 /* Driver statistics maintained by driver */
-struct swStat {
+struct swErrStat {
        unsigned long long single_ecc_errs;
        unsigned long long double_ecc_errs;
        unsigned long long parity_err_cnt;
        unsigned long long serious_err_cnt;
        unsigned long long soft_reset_cnt;
-       unsigned long long fifo_full_cnt;
-       unsigned long long ring_full_cnt[8];
-       /* LRO statistics */
-       unsigned long long clubbed_frms_cnt;
-       unsigned long long sending_both;
-       unsigned long long outof_sequence_pkts;
-       unsigned long long flush_max_pkts;
-       unsigned long long sum_avg_pkts_aggregated;
-       unsigned long long num_aggregations;
-       /* Other statistics */
-       unsigned long long mem_alloc_fail_cnt;
-       unsigned long long pci_map_fail_cnt;
        unsigned long long watchdog_timer_cnt;
-       unsigned long long mem_allocated;
-       unsigned long long mem_freed;
-       unsigned long long link_up_cnt;
-       unsigned long long link_down_cnt;
-       unsigned long long link_up_time;
-       unsigned long long link_down_time;
 
-       /* Transfer Code statistics */
-       unsigned long long tx_buf_abort_cnt;
-       unsigned long long tx_desc_abort_cnt;
-       unsigned long long tx_parity_err_cnt;
-       unsigned long long tx_link_loss_cnt;
-       unsigned long long tx_list_proc_err_cnt;
-
-       unsigned long long rx_parity_err_cnt;
-       unsigned long long rx_abort_cnt;
-       unsigned long long rx_parity_abort_cnt;
-       unsigned long long rx_rda_fail_cnt;
-       unsigned long long rx_unkn_prot_cnt;
-       unsigned long long rx_fcs_err_cnt;
-       unsigned long long rx_buf_size_err_cnt;
-       unsigned long long rx_rxd_corrupt_cnt;
-       unsigned long long rx_unkn_err_cnt;
+       /* skb_null statistics */
+       unsigned long long skb_null_s2io_xmit_cnt;
+       unsigned long long skb_null_tx_intr_handler_cnt;
 
        /* Error/alarm statistics*/
        unsigned long long tda_err_cnt;
@@ -142,8 +135,65 @@ struct swStat {
        unsigned long long rda_err_cnt;
        unsigned long long rti_err_cnt;
        unsigned long long mc_err_cnt;
+}____cacheline_aligned;
 
-};
+       /* Transfer Code statistics */
+struct txFifoStat {
+       unsigned long long fifo_full_cnt;
+       unsigned long long tx_buf_abort_cnt;
+       unsigned long long tx_desc_abort_cnt;
+       unsigned long long tx_parity_err_cnt;
+       unsigned long long tx_link_loss_cnt;
+       unsigned long long tx_list_proc_err_cnt;
+}____cacheline_aligned;
+
+struct swLROStat {
+       /* LRO statistics */
+       /* Packets received - Packets sent to the stack */
+       unsigned long long clubbed_frms_cnt;
+       /* Number of times the aggregation of packets broken */
+       unsigned long long sending_both;
+       /* Number of out of order packets */
+       unsigned long long outof_sequence_pkts;
+       /* Number of times we reached upper packet limit for aggregation per session */
+       unsigned long long flush_max_pkts;
+       /* Total number of packets considered for aggregation */
+       unsigned long long sum_avg_pkts_aggregated;
+       /* Number of packets sent to the stack */
+       unsigned long long num_aggregations;
+}____cacheline_aligned;
+
+struct rxRingStat {
+       unsigned long long ring_full_cnt;
+       unsigned long long rx_parity_err_cnt;
+       unsigned long long rx_abort_cnt;
+       unsigned long long rx_parity_abort_cnt;
+       unsigned long long rx_rda_fail_cnt;
+       unsigned long long rx_unkn_prot_cnt;
+       unsigned long long rx_fcs_err_cnt;
+       unsigned long long rx_buf_size_err_cnt;
+       unsigned long long rx_rxd_corrupt_cnt;
+       unsigned long long rx_unkn_err_cnt;
+       unsigned long long rx_mem_alloc_fail_cnt;
+       unsigned long long rx_pci_map_fail_cnt;
+       unsigned long long skb_null_rx_intr_handler_cnt;
+       unsigned long long rx_mem_allocated;
+       unsigned long long rx_mem_freed;
+       struct swLROStat sw_lro_stat;
+}____cacheline_aligned;
+
+struct swDbgStat {
+       /* Other statistics */
+       u64 tmac_frms_q[8];
+       unsigned long long mem_alloc_fail_cnt;
+       unsigned long long pci_map_fail_cnt;
+       unsigned long long mem_allocated;
+       unsigned long long mem_freed;
+       unsigned long long link_up_cnt;
+       unsigned long long link_down_cnt;
+       unsigned long long link_up_time;
+       unsigned long long link_down_time;
+}____cacheline_aligned;
 
 /* Xpak releated alarm and warnings */
 struct xpakStat {
@@ -161,192 +211,312 @@ struct xpakStat {
        u64 warn_laser_output_power_low;
        u64 xpak_regs_stat;
        u32 xpak_timer_count;
-};
-
+}____cacheline_aligned;
+
+#ifdef TITAN_LEGACY
+struct statLinkBlock {
+       u64     tx_frms;
+       u64     tx_ttl_eth_octets;
+       u64     tx_data_octets;
+       u64     tx_mcst_frms;
+       u64     tx_bcst_frms;
+       u64     tx_ucst_frms;
+       u64     tx_tagged_frms;
+       u64     tx_vld_ip;
+       u64     tx_vld_ip_octets;
+       u64     tx_icmp;
+       u64     tx_tcp;
+       u64     tx_rst_tcp;
+       u64     tx_udp;
+       u64     tx_unknown_protocol;
+       u64     tx_parse_error;
+       u64     tx_pause_ctrl_frms;
+       u64     tx_lacpdu_frms;
+       u64     tx_marker_pdu_frms;
+       u64     tx_marker_resp_pdu_frms;
+       u64     tx_drop_ip;
+       u64     tx_xgmii_char1_match;
+       u64     tx_xgmii_char2_match;
+       u64     tx_xgmii_column1_match;
+       u64     tx_xgmii_column2_match;
+       u64     tx_drop_frms;
+       u64     tx_any_err_frms;
+       u64     rx_ttl_frms;
+       u64     rx_vld_frms;
+       u64     rx_offld_frms;
+       u64     rx_ttl_eth_octets;
+       u64     rx_data_octets;
+       u64     rx_offld_octets;
+       u64     rx_vld_mcst_frms;
+       u64     rx_vld_bcst_frms;
+       u64     rx_accepted_ucst_frms;
+       u64     rx_accepted_nucst_frms;
+       u64     rx_tagged_frms;
+       u64     rx_long_frms;
+       u64     rx_usized_frms;
+       u64     rx_osized_frms;
+       u64     rx_frag_frms;
+       u64     rx_jabber_frms;
+       u64     rx_ttl_64_frms;
+       u64     rx_ttl_65_127_frms;
+       u64     rx_ttl_128_255_frms;
+       u64     rx_ttl_256_511_frms;
+       u64     rx_ttl_512_1023_frms;
+       u64     rx_ttl_1024_1518_frms;
+       u64     rx_ttl_1519_4095_frms;
+       u64     rx_ttl_40956_8191_frms;
+       u64     rx_ttl_8192_max_frms;
+       u64     rx_ttl_gt_max_frms;
+       u64     rx_ip;
+       u64     rx_ip_octets;
+       u64     rx_hdr_err_ip;
+       u64     rx_icmp;
+       u64     rx_tcp;
+       u64     rx_udp;
+       u64     rx_err_tcp;
+       u64     rx_pause_cnt;
+       u64     rx_pause_ctrl_frms;
+       u64     rx_unsup_ctrl_frms;
+       u64     rx_in_rng_len_err_frms;
+       u64     rx_out_rng_len_err_frms;
+       u64     rx_drop_frms;
+       u64     rx_discarded_frms;
+       u64     rx_drop_ip;
+       u64     rx_err_drp_udp;
+       u64     rx_lacpdu_frms;
+       u64     rx_marker_pdu_frms;
+       u64     rx_marker_resp_pdu_frms;
+       u64     rx_unknown_pdu_frms;
+       u64     rx_illegal_pdu_frms;
+       u64     rx_fcs_discard;
+       u64     rx_len_discard;
+       u64     rx_pf_discard;
+       u64     rx_trash_discard;
+       u64     rx_rts_discard;
+       u64     rx_wol_discard;
+       u64     rx_red_discard;
+       u64     rx_ingm_full_discard;
+       u64     rx_xgmii_data_err_cnt;
+       u64     rx_xgmii_ctrl_err_cnt;
+       u64     rx_xgmii_err_sym;
+       u64     rx_xgmii_char1_match;
+       u64     rx_xgmii_char2_match;
+       u64     rx_xgmii_column1_match;
+       u64     rx_xgmii_column2_match;
+       u64     rx_local_fault;
+       u64     rx_remote_fault;
+       u64     rx_queue_full;
+}____cacheline_aligned;
+
+struct statsAggrBlock {
+       u64     tx_frms;
+       u64     tx_mcst_frms;
+       u64     tx_bcst_frms;
+       u64     tx_discarded_frms;
+       u64     tx_errored_frms;
+       u64     rx_frms;
+       u64     rx_data_octets;
+       u64     rx_mcst_frms;
+       u64     rx_bcst_frms;
+       u64     rx_discarded_frms;
+       u64     rx_errored_frms;
+       u64     rx_unknown_protocol_frms;
+}____cacheline_aligned;
+#endif
 
 /* The statistics block of Xena */
 struct stat_block {
 /* Tx MAC statistics counters. */
-       __le32 tmac_data_octets;
-       __le32 tmac_frms;
-       __le64 tmac_drop_frms;
-       __le32 tmac_bcst_frms;
-       __le32 tmac_mcst_frms;
-       __le64 tmac_pause_ctrl_frms;
-       __le32 tmac_ucst_frms;
-       __le32 tmac_ttl_octets;
-       __le32 tmac_any_err_frms;
-       __le32 tmac_nucst_frms;
-       __le64 tmac_ttl_less_fb_octets;
-       __le64 tmac_vld_ip_octets;
-       __le32 tmac_drop_ip;
-       __le32 tmac_vld_ip;
-       __le32 tmac_rst_tcp;
-       __le32 tmac_icmp;
-       __le64 tmac_tcp;
-       __le32 reserved_0;
-       __le32 tmac_udp;
+#ifndef TITAN_LEGACY
+       u32 tmac_data_octets;
+       u32 tmac_frms;
+       u64 tmac_drop_frms;
+       u32 tmac_bcst_frms;
+       u32 tmac_mcst_frms;
+       u64 tmac_pause_ctrl_frms;
+       u32 tmac_ucst_frms;
+       u32 tmac_ttl_octets;
+       u32 tmac_any_err_frms;
+       u32 tmac_nucst_frms;
+       u64 tmac_ttl_less_fb_octets;
+       u64 tmac_vld_ip_octets;
+       u32 tmac_drop_ip;
+       u32 tmac_vld_ip;
+       u32 tmac_rst_tcp;
+       u32 tmac_icmp;
+       u64 tmac_tcp;
+       u32 reserved_0;
+       u32 tmac_udp;
 
 /* Rx MAC Statistics counters. */
-       __le32 rmac_data_octets;
-       __le32 rmac_vld_frms;
-       __le64 rmac_fcs_err_frms;
-       __le64 rmac_drop_frms;
-       __le32 rmac_vld_bcst_frms;
-       __le32 rmac_vld_mcst_frms;
-       __le32 rmac_out_rng_len_err_frms;
-       __le32 rmac_in_rng_len_err_frms;
-       __le64 rmac_long_frms;
-       __le64 rmac_pause_ctrl_frms;
-       __le64 rmac_unsup_ctrl_frms;
-       __le32 rmac_accepted_ucst_frms;
-       __le32 rmac_ttl_octets;
-       __le32 rmac_discarded_frms;
-       __le32 rmac_accepted_nucst_frms;
-       __le32 reserved_1;
-       __le32 rmac_drop_events;
-       __le64 rmac_ttl_less_fb_octets;
-       __le64 rmac_ttl_frms;
-       __le64 reserved_2;
-       __le32 rmac_usized_frms;
-       __le32 reserved_3;
-       __le32 rmac_frag_frms;
-       __le32 rmac_osized_frms;
-       __le32 reserved_4;
-       __le32 rmac_jabber_frms;
-       __le64 rmac_ttl_64_frms;
-       __le64 rmac_ttl_65_127_frms;
-       __le64 reserved_5;
-       __le64 rmac_ttl_128_255_frms;
-       __le64 rmac_ttl_256_511_frms;
-       __le64 reserved_6;
-       __le64 rmac_ttl_512_1023_frms;
-       __le64 rmac_ttl_1024_1518_frms;
-       __le32 rmac_ip;
-       __le32 reserved_7;
-       __le64 rmac_ip_octets;
-       __le32 rmac_drop_ip;
-       __le32 rmac_hdr_err_ip;
-       __le32 reserved_8;
-       __le32 rmac_icmp;
-       __le64 rmac_tcp;
-       __le32 rmac_err_drp_udp;
-       __le32 rmac_udp;
-       __le64 rmac_xgmii_err_sym;
-       __le64 rmac_frms_q0;
-       __le64 rmac_frms_q1;
-       __le64 rmac_frms_q2;
-       __le64 rmac_frms_q3;
-       __le64 rmac_frms_q4;
-       __le64 rmac_frms_q5;
-       __le64 rmac_frms_q6;
-       __le64 rmac_frms_q7;
-       __le16 rmac_full_q3;
-       __le16 rmac_full_q2;
-       __le16 rmac_full_q1;
-       __le16 rmac_full_q0;
-       __le16 rmac_full_q7;
-       __le16 rmac_full_q6;
-       __le16 rmac_full_q5;
-       __le16 rmac_full_q4;
-       __le32 reserved_9;
-       __le32 rmac_pause_cnt;
-       __le64 rmac_xgmii_data_err_cnt;
-       __le64 rmac_xgmii_ctrl_err_cnt;
-       __le32 rmac_err_tcp;
-       __le32 rmac_accepted_ip;
+       u32 rmac_data_octets;
+       u32 rmac_vld_frms;
+       u64 rmac_fcs_err_frms;
+       u64 rmac_drop_frms;
+       u32 rmac_vld_bcst_frms;
+       u32 rmac_vld_mcst_frms;
+       u32 rmac_out_rng_len_err_frms;
+       u32 rmac_in_rng_len_err_frms;
+       u64 rmac_long_frms;
+       u64 rmac_pause_ctrl_frms;
+       u64 rmac_unsup_ctrl_frms;
+       u32 rmac_accepted_ucst_frms;
+       u32 rmac_ttl_octets;
+       u32 rmac_discarded_frms;
+       u32 rmac_accepted_nucst_frms;
+       u32 reserved_1;
+       u32 rmac_drop_events;
+       u64 rmac_ttl_less_fb_octets;
+       u64 rmac_ttl_frms;
+       u64 reserved_2;
+       u32 rmac_usized_frms;
+       u32 reserved_3;
+       u32 rmac_frag_frms;
+       u32 rmac_osized_frms;
+       u32 reserved_4;
+       u32 rmac_jabber_frms;
+       u64 rmac_ttl_64_frms;
+       u64 rmac_ttl_65_127_frms;
+       u64 reserved_5;
+       u64 rmac_ttl_128_255_frms;
+       u64 rmac_ttl_256_511_frms;
+       u64 reserved_6;
+       u64 rmac_ttl_512_1023_frms;
+       u64 rmac_ttl_1024_1518_frms;
+       u32 rmac_ip;
+       u32 reserved_7;
+       u64 rmac_ip_octets;
+       u32 rmac_drop_ip;
+       u32 rmac_hdr_err_ip;
+       u32 reserved_8;
+       u32 rmac_icmp;
+       u64 rmac_tcp;
+       u32 rmac_err_drp_udp;
+       u32 rmac_udp;
+       u64 rmac_xgmii_err_sym;
+       u64 rmac_frms_q0;
+       u64 rmac_frms_q1;
+       u64 rmac_frms_q2;
+       u64 rmac_frms_q3;
+       u64 rmac_frms_q4;
+       u64 rmac_frms_q5;
+       u64 rmac_frms_q6;
+       u64 rmac_frms_q7;
+       u16 rmac_full_q3;
+       u16 rmac_full_q2;
+       u16 rmac_full_q1;
+       u16 rmac_full_q0;
+       u16 rmac_full_q7;
+       u16 rmac_full_q6;
+       u16 rmac_full_q5;
+       u16 rmac_full_q4;
+       u32 reserved_9;
+       u32 rmac_pause_cnt;
+       u64 rmac_xgmii_data_err_cnt;
+       u64 rmac_xgmii_ctrl_err_cnt;
+       u32 rmac_err_tcp;
+       u32 rmac_accepted_ip;
 
 /* PCI/PCI-X Read transaction statistics. */
-       __le32 new_rd_req_cnt;
-       __le32 rd_req_cnt;
-       __le32 rd_rtry_cnt;
-       __le32 new_rd_req_rtry_cnt;
+       u32 new_rd_req_cnt;
+       u32 rd_req_cnt;
+       u32 rd_rtry_cnt;
+       u32 new_rd_req_rtry_cnt;
 
 /* PCI/PCI-X Write/Read transaction statistics. */
-       __le32 wr_req_cnt;
-       __le32 wr_rtry_rd_ack_cnt;
-       __le32 new_wr_req_rtry_cnt;
-       __le32 new_wr_req_cnt;
-       __le32 wr_disc_cnt;
-       __le32 wr_rtry_cnt;
+       u32 wr_req_cnt;
+       u32 wr_rtry_rd_ack_cnt;
+       u32 new_wr_req_rtry_cnt;
+       u32 new_wr_req_cnt;
+       u32 wr_disc_cnt;
+       u32 wr_rtry_cnt;
 
 /*     PCI/PCI-X Write / DMA Transaction statistics. */
-       __le32 txp_wr_cnt;
-       __le32 rd_rtry_wr_ack_cnt;
-       __le32 txd_wr_cnt;
-       __le32 txd_rd_cnt;
-       __le32 rxd_wr_cnt;
-       __le32 rxd_rd_cnt;
-       __le32 rxf_wr_cnt;
-       __le32 txf_rd_cnt;
+       u32 txp_wr_cnt;
+       u32 rd_rtry_wr_ack_cnt;
+       u32 txd_wr_cnt;
+       u32 txd_rd_cnt;
+       u32 rxd_wr_cnt;
+       u32 rxd_rd_cnt;
+       u32 rxf_wr_cnt;
+       u32 txf_rd_cnt;
 
 /* Tx MAC statistics overflow counters. */
-       __le32 tmac_data_octets_oflow;
-       __le32 tmac_frms_oflow;
-       __le32 tmac_bcst_frms_oflow;
-       __le32 tmac_mcst_frms_oflow;
-       __le32 tmac_ucst_frms_oflow;
-       __le32 tmac_ttl_octets_oflow;
-       __le32 tmac_any_err_frms_oflow;
-       __le32 tmac_nucst_frms_oflow;
-       __le64 tmac_vlan_frms;
-       __le32 tmac_drop_ip_oflow;
-       __le32 tmac_vld_ip_oflow;
-       __le32 tmac_rst_tcp_oflow;
-       __le32 tmac_icmp_oflow;
-       __le32 tpa_unknown_protocol;
-       __le32 tmac_udp_oflow;
-       __le32 reserved_10;
-       __le32 tpa_parse_failure;
+       u32 tmac_data_octets_oflow;
+       u32 tmac_frms_oflow;
+       u32 tmac_bcst_frms_oflow;
+       u32 tmac_mcst_frms_oflow;
+       u32 tmac_ucst_frms_oflow;
+       u32 tmac_ttl_octets_oflow;
+       u32 tmac_any_err_frms_oflow;
+       u32 tmac_nucst_frms_oflow;
+       u64 tmac_vlan_frms;
+       u32 tmac_drop_ip_oflow;
+       u32 tmac_vld_ip_oflow;
+       u32 tmac_rst_tcp_oflow;
+       u32 tmac_icmp_oflow;
+       u32 tpa_unknown_protocol;
+       u32 tmac_udp_oflow;
+       u32 reserved_10;
+       u32 tpa_parse_failure;
 
 /* Rx MAC Statistics overflow counters. */
-       __le32 rmac_data_octets_oflow;
-       __le32 rmac_vld_frms_oflow;
-       __le32 rmac_vld_bcst_frms_oflow;
-       __le32 rmac_vld_mcst_frms_oflow;
-       __le32 rmac_accepted_ucst_frms_oflow;
-       __le32 rmac_ttl_octets_oflow;
-       __le32 rmac_discarded_frms_oflow;
-       __le32 rmac_accepted_nucst_frms_oflow;
-       __le32 rmac_usized_frms_oflow;
-       __le32 rmac_drop_events_oflow;
-       __le32 rmac_frag_frms_oflow;
-       __le32 rmac_osized_frms_oflow;
-       __le32 rmac_ip_oflow;
-       __le32 rmac_jabber_frms_oflow;
-       __le32 rmac_icmp_oflow;
-       __le32 rmac_drop_ip_oflow;
-       __le32 rmac_err_drp_udp_oflow;
-       __le32 rmac_udp_oflow;
-       __le32 reserved_11;
-       __le32 rmac_pause_cnt_oflow;
-       __le64 rmac_ttl_1519_4095_frms;
-       __le64 rmac_ttl_4096_8191_frms;
-       __le64 rmac_ttl_8192_max_frms;
-       __le64 rmac_ttl_gt_max_frms;
-       __le64 rmac_osized_alt_frms;
-       __le64 rmac_jabber_alt_frms;
-       __le64 rmac_gt_max_alt_frms;
-       __le64 rmac_vlan_frms;
-       __le32 rmac_len_discard;
-       __le32 rmac_fcs_discard;
-       __le32 rmac_pf_discard;
-       __le32 rmac_da_discard;
-       __le32 rmac_red_discard;
-       __le32 rmac_rts_discard;
-       __le32 reserved_12;
-       __le32 rmac_ingm_full_discard;
-       __le32 reserved_13;
-       __le32 rmac_accepted_ip_oflow;
-       __le32 reserved_14;
-       __le32 link_fault_cnt;
+       u32 rmac_data_octets_oflow;
+       u32 rmac_vld_frms_oflow;
+       u32 rmac_vld_bcst_frms_oflow;
+       u32 rmac_vld_mcst_frms_oflow;
+       u32 rmac_accepted_ucst_frms_oflow;
+       u32 rmac_ttl_octets_oflow;
+       u32 rmac_discarded_frms_oflow;
+       u32 rmac_accepted_nucst_frms_oflow;
+       u32 rmac_usized_frms_oflow;
+       u32 rmac_drop_events_oflow;
+       u32 rmac_frag_frms_oflow;
+       u32 rmac_osized_frms_oflow;
+       u32 rmac_ip_oflow;
+       u32 rmac_jabber_frms_oflow;
+       u32 rmac_icmp_oflow;
+       u32 rmac_drop_ip_oflow;
+       u32 rmac_err_drp_udp_oflow;
+       u32 rmac_udp_oflow;
+       u32 reserved_11;
+       u32 rmac_pause_cnt_oflow;
+       u64 rmac_ttl_1519_4095_frms;
+       u64 rmac_ttl_4096_8191_frms;
+       u64 rmac_ttl_8192_max_frms;
+       u64 rmac_ttl_gt_max_frms;
+       u64 rmac_osized_alt_frms;
+       u64 rmac_jabber_alt_frms;
+       u64 rmac_gt_max_alt_frms;
+       u64 rmac_vlan_frms;
+       u32 rmac_len_discard;
+       u32 rmac_fcs_discard;
+       u32 rmac_pf_discard;
+       u32 rmac_da_discard;
+       u32 rmac_wol_discard;
+       u32 rmac_rts_discard;
+       u32 rmac_ingm_full_discard;
+       u32 rmac_red_discard;
+       u32 reserved_12;
+       u32 rmac_accepted_ip_oflow;
+       u32 reserved_13;
+       u32 link_fault_cnt;
        u8  buffer[20];
-       struct swStat sw_stat;
-       struct xpakStat xpak_stat;
-};
+#else
+       struct statLinkBlock stats_link_info[MAC_LINKS];
+       struct statsAggrBlock stats_aggr_info[MAC_AGGREGATORS];
+#endif
+}__attribute__ ((aligned (128)));
+
+/* Macros for vlan tag handling */
+#define S2IO_DO_NOT_STRIP_VLAN_TAG             0
+#define S2IO_STRIP_VLAN_TAG                    1
+#define S2IO_DEFAULT_STRIP_MODE_VLAN_TAG       2
 
-/* Default value for 'vlan_strip_tag' configuration parameter */
-#define NO_STRIP_IN_PROMISC 2
+/* Macros for LRO handling */
+#define S2IO_DONOT_AGGREGATE                   0
+#define S2IO_ALWAYS_AGGREGATE                  1
+#define S2IO_DONT_AGGR_FWD_PKTS                        2
 
 /*
  * Structures representing different init time configuration
@@ -356,74 +526,62 @@ struct stat_block {
 #define MAX_TX_FIFOS 8
 #define MAX_RX_RINGS 8
 
-#define FIFO_DEFAULT_NUM       5
+#define RTH_MIN_RING_NUM 2
+
+/* RTH mask bits */
+#define S2IO_RTS_RTH_MASK_IPV4_SRC             0x1
+#define S2IO_RTS_RTH_MASK_IPV4_DST             0x2
+#define S2IO_RTS_RTH_MASK_IPV6_SRC             0x4
+#define S2IO_RTS_RTH_MASK_IPV6_DST             0x8
+#define S2IO_RTS_RTH_MASK_L4_SRC               0x10
+#define S2IO_RTS_RTH_MASK_L4_DST               0x20
+
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
+#define FIFO_DEFAULT_NUM                       MAX_TX_FIFOS
+#else
+#define FIFO_DEFAULT_NUM                       5
+#endif
+#else
+#define FIFO_DEFAULT_NUM                       5
+#endif
+
 #define FIFO_UDP_MAX_NUM                       2 /* 0 - even, 1 -odd ports */
 #define FIFO_OTHER_MAX_NUM                     1
+#define FIFO_DEFAULT_LEN                       1024
 
-
-#define MAX_RX_DESC_1  (MAX_RX_RINGS * MAX_RX_BLOCKS_PER_RING * 127 )
-#define MAX_RX_DESC_2  (MAX_RX_RINGS * MAX_RX_BLOCKS_PER_RING * 85 )
-#define MAX_RX_DESC_3  (MAX_RX_RINGS * MAX_RX_BLOCKS_PER_RING * 85 )
 #define MAX_TX_DESC    (MAX_AVAILABLE_TXDS)
 
-/* FIFO mappings for all possible number of fifos configured */
-static int fifo_map[][MAX_TX_FIFOS] = {
-       {0, 0, 0, 0, 0, 0, 0, 0},
-       {0, 0, 0, 0, 1, 1, 1, 1},
-       {0, 0, 0, 1, 1, 1, 2, 2},
-       {0, 0, 1, 1, 2, 2, 3, 3},
-       {0, 0, 1, 1, 2, 2, 3, 4},
-       {0, 0, 1, 1, 2, 3, 4, 5},
-       {0, 0, 1, 2, 3, 4, 5, 6},
-       {0, 1, 2, 3, 4, 5, 6, 7},
-};
-
-static u16 fifo_selector[MAX_TX_FIFOS] = {0, 1, 3, 3, 7, 7, 7, 7};
-
 /* Maintains Per FIFO related information. */
 struct tx_fifo_config {
-#define        MAX_AVAILABLE_TXDS      8192
-       u32 fifo_len;           /* specifies len of FIFO upto 8192, ie no of TxDLs */
+#define        MAX_AVAILABLE_TXDS                      8192
+       u32 fifo_len;   /* specifies len of FIFO upto 8192, ie no of TxDLs */
 /* Priority definition */
-#define TX_FIFO_PRI_0               0  /*Highest */
-#define TX_FIFO_PRI_1               1
-#define TX_FIFO_PRI_2               2
-#define TX_FIFO_PRI_3               3
-#define TX_FIFO_PRI_4               4
-#define TX_FIFO_PRI_5               5
-#define TX_FIFO_PRI_6               6
-#define TX_FIFO_PRI_7               7  /*lowest */
+#define TX_FIFO_PRI_0                          0       /*Highest */
+#define TX_FIFO_PRI_1                          1
+#define TX_FIFO_PRI_2                          2
+#define TX_FIFO_PRI_3                          3
+#define TX_FIFO_PRI_4                          4
+#define TX_FIFO_PRI_5                          5
+#define TX_FIFO_PRI_6                          6
+#define TX_FIFO_PRI_7                          7       /*lowest */
        u8 fifo_priority;       /* specifies pointer level for FIFO */
-       /* user should not set twos fifos with same pri */
-       u8 f_no_snoop;
-#define NO_SNOOP_TXD                0x01
-#define NO_SNOOP_TXD_BUFFER          0x02
-};
-
+}____cacheline_aligned;
 
 /* Maintains per Ring related information */
 struct rx_ring_config {
        u32 num_rxd;            /*No of RxDs per Rx Ring */
-#define RX_RING_PRI_0               0  /* highest */
-#define RX_RING_PRI_1               1
-#define RX_RING_PRI_2               2
-#define RX_RING_PRI_3               3
-#define RX_RING_PRI_4               4
-#define RX_RING_PRI_5               5
-#define RX_RING_PRI_6               6
-#define RX_RING_PRI_7               7  /* lowest */
+#define RX_RING_PRI_0                          0       /* highest */
+#define RX_RING_PRI_1                          1
+#define RX_RING_PRI_2                          2
+#define RX_RING_PRI_3                          3
+#define RX_RING_PRI_4                          4
+#define RX_RING_PRI_5                          5
+#define RX_RING_PRI_6                          6
+#define RX_RING_PRI_7                          7       /* lowest */
 
        u8 ring_priority;       /*Specifies service priority of ring */
-       /* OSM should not set any two rings with same priority */
-       u8 ring_org;            /*Organization of ring */
-#define RING_ORG_BUFF1         0x01
-#define RX_RING_ORG_BUFF3      0x03
-#define RX_RING_ORG_BUFF5      0x05
-
-       u8 f_no_snoop;
-#define NO_SNOOP_RXD                0x01
-#define NO_SNOOP_RXD_BUFFER         0x02
-};
+}____cacheline_aligned;
 
 /* This structure provides contains values of the tunable parameters
  * of the H/W
@@ -431,48 +589,65 @@ struct rx_ring_config {
 struct config_param {
 /* Tx Side */
        u32 tx_fifo_num;        /*Number of Tx FIFOs */
-
-       /* 0-No steering, 1-Priority steering, 2-Default fifo map */
-#define        NO_STEERING                             0
+       /* 0-No steering, 1-priority steering, 2-Default fifo map */
 #define        TX_PRIORITY_STEERING                    0x1
-#define TX_DEFAULT_STEERING                    0x2
+#define        TX_VLAN_STEERING                        0x2
+#define TX_STEERING_DEFAULT                    0x3
        u8 tx_steering_type;
 
-       u8 fifo_mapping[MAX_TX_FIFOS];
-       struct tx_fifo_config tx_cfg[MAX_TX_FIFOS];     /*Per-Tx FIFO config */
+       struct tx_fifo_config tx_cfg[MAX_TX_FIFOS];/*Per-Tx FIFO config */
        u32 max_txds;           /*Max no. of Tx buffer descriptor per TxDL */
+       /* Specifies if Tx Intr is UTILZ or PER_LIST type. */
        u64 tx_intr_type;
-#define INTA   0
-#define MSI_X  2
-       u8 intr_type;
-       u8 napi;
 
-       /* Specifies if Tx Intr is UTILZ or PER_LIST type. */
+#define INTA                                   0
+#define MSI_X                                  2
+#define DEF_MSI_X                              99
+       u8 intr_type;
 
+       u8 napi;
 /* Rx Side */
        u32 rx_ring_num;        /*Number of receive rings */
-#define MAX_RX_BLOCKS_PER_RING  150
 
        struct rx_ring_config rx_cfg[MAX_RX_RINGS];     /*Per-Rx Ring config */
 
-#define HEADER_ETHERNET_II_802_3_SIZE 14
-#define HEADER_802_2_SIZE              3
-#define HEADER_SNAP_SIZE               5
-#define HEADER_VLAN_SIZE               4
-
-#define MIN_MTU                       46
-#define MAX_PYLD                    1500
-#define MAX_MTU                     (MAX_PYLD+18)
-#define MAX_MTU_VLAN                (MAX_PYLD+22)
-#define MAX_PYLD_JUMBO              9600
-#define MAX_MTU_JUMBO               (MAX_PYLD_JUMBO+18)
-#define MAX_MTU_JUMBO_VLAN          (MAX_PYLD_JUMBO+22)
+#define HEADER_ETHERNET_II_802_3_SIZE          14
+#define HEADER_802_2_SIZE                      3
+#define HEADER_SNAP_SIZE                       5
+#define HEADER_VLAN_SIZE                       4
+
+#define MIN_MTU                                        68
+#define MAX_PYLD                               1500
+#define MAX_MTU                                        (MAX_PYLD+18)
+#define MAX_MTU_VLAN                           (MAX_PYLD+22)
+#define MAX_PYLD_JUMBO                         9600
+#define MAX_MTU_JUMBO                          (MAX_PYLD_JUMBO+18)
+#define MAX_MTU_JUMBO_VLAN                     (MAX_PYLD_JUMBO+22)
        u16 bus_speed;
+#define        NO_STEERING                             0
+#define        PORT_STEERING                           0x1
+#define        RTH_STEERING                            0x2
+#define        RX_TOS_STEERING                         0x3
+#define        RX_VLAN_STEERING                        0x4
+/* The driver assumes a default setting of RTH_STEERING internally and
+ * will enable some rings based on it.
+ * If the user enables rth_steering on the driver load, then the number of
+ * rings enabled will be equal to the number of cpus (max of 8), which can
+ * be overridden by the user.
+ */
+#define RTH_STEERING_DEFAULT                   0x5
+       u8 rx_steering_type;
+#define        MAX_STEERABLE_PORTS                     256
+       int steer_ports[MAX_STEERABLE_PORTS];
+       int port_type;
+#define        SP      2
+#define        DP      1
        int max_mc_addr;        /* xena=64 herc=256 */
        int max_mac_addr;       /* xena=16 herc=64 */
        int mc_start_offset;    /* xena=16 herc=64 */
        u8 multiq;
-};
+       u8 vlan_tag_strip;
+}____cacheline_aligned;
 
 /* Structure representing MAC Addrs */
 struct mac_addr {
@@ -486,44 +661,45 @@ struct TxFIFO_element {
        u64 TxDL_Pointer;
 
        u64 List_Control;
-#define TX_FIFO_LAST_TXD_NUM( val)     vBIT(val,0,8)
-#define TX_FIFO_FIRST_LIST             s2BIT(14)
-#define TX_FIFO_LAST_LIST              s2BIT(15)
-#define TX_FIFO_FIRSTNLAST_LIST        vBIT(3,14,2)
-#define TX_FIFO_SPECIAL_FUNC           s2BIT(23)
-#define TX_FIFO_DS_NO_SNOOP            s2BIT(31)
-#define TX_FIFO_BUFF_NO_SNOOP          s2BIT(30)
+#define TX_FIFO_LAST_TXD_NUM(val)              vBIT(val, 0, 8)
+#define TX_FIFO_FIRST_LIST                     S2BIT(14)
+#define TX_FIFO_LAST_LIST                      S2BIT(15)
+#define TX_FIFO_FIRSTNLAST_LIST                        vBIT(3, 14, 2)
+#define TX_FIFO_SPECIAL_FUNC                   S2BIT(23)
+#define TX_FIFO_DS_NO_SNOOP                    S2BIT(31)
+#define TX_FIFO_BUFF_NO_SNOOP                  S2BIT(30)
 };
 
 /* Tx descriptor structure */
 struct TxD {
        u64 Control_1;
 /* bit mask */
-#define TXD_LIST_OWN_XENA       s2BIT(7)
-#define TXD_T_CODE              (s2BIT(12)|s2BIT(13)|s2BIT(14)|s2BIT(15))
-#define TXD_T_CODE_OK(val)      (|(val & TXD_T_CODE))
-#define GET_TXD_T_CODE(val)     ((val & TXD_T_CODE)<<12)
-#define TXD_GATHER_CODE         (s2BIT(22) | s2BIT(23))
-#define TXD_GATHER_CODE_FIRST   s2BIT(22)
-#define TXD_GATHER_CODE_LAST    s2BIT(23)
-#define TXD_TCP_LSO_EN          s2BIT(30)
-#define TXD_UDP_COF_EN          s2BIT(31)
-#define TXD_UFO_EN             s2BIT(31) | s2BIT(30)
-#define TXD_TCP_LSO_MSS(val)    vBIT(val,34,14)
-#define TXD_UFO_MSS(val)       vBIT(val,34,14)
-#define TXD_BUFFER0_SIZE(val)   vBIT(val,48,16)
+#define TXD_LIST_OWN_XENA                      S2BIT(7)
+#define TXD_T_CODE                             (S2BIT(12)|S2BIT(13)|\
+                                               S2BIT(14)|S2BIT(15))
+#define TXD_T_CODE_OK(val)                     (|(val & TXD_T_CODE))
+#define GET_TXD_T_CODE(val)                    ((val & TXD_T_CODE) >> 48)
+#define TXD_GATHER_CODE                                (S2BIT(22) | S2BIT(23))
+#define TXD_GATHER_CODE_FIRST                  S2BIT(22)
+#define TXD_GATHER_CODE_LAST                   S2BIT(23)
+#define TXD_TCP_LSO_EN                         S2BIT(30)
+#define TXD_UDP_COF_EN                         S2BIT(31)
+#define TXD_UFO_EN                             S2BIT(31) | S2BIT(30)
+#define TXD_TCP_LSO_MSS(val)                   vBIT(val, 34, 14)
+#define TXD_UFO_MSS(val)                       vBIT(val, 34, 14)
+#define TXD_BUFFER0_SIZE(val)                  vBIT(val, 48, 16)
 
        u64 Control_2;
-#define TXD_TX_CKO_CONTROL      (s2BIT(5)|s2BIT(6)|s2BIT(7))
-#define TXD_TX_CKO_IPV4_EN      s2BIT(5)
-#define TXD_TX_CKO_TCP_EN       s2BIT(6)
-#define TXD_TX_CKO_UDP_EN       s2BIT(7)
-#define TXD_VLAN_ENABLE         s2BIT(15)
-#define TXD_VLAN_TAG(val)       vBIT(val,16,16)
-#define TXD_INT_NUMBER(val)     vBIT(val,34,6)
-#define TXD_INT_TYPE_PER_LIST   s2BIT(47)
-#define TXD_INT_TYPE_UTILZ      s2BIT(46)
-#define TXD_SET_MARKER         vBIT(0x6,0,4)
+#define TXD_TX_CKO_CONTROL                     (S2BIT(5)|S2BIT(6)|S2BIT(7))
+#define TXD_TX_CKO_IPV4_EN                     S2BIT(5)
+#define TXD_TX_CKO_TCP_EN                      S2BIT(6)
+#define TXD_TX_CKO_UDP_EN                      S2BIT(7)
+#define TXD_VLAN_ENABLE                                S2BIT(15)
+#define TXD_VLAN_TAG(val)                      vBIT(val, 16, 16)
+#define TXD_INT_NUMBER(val)                    vBIT(val, 34, 6)
+#define TXD_INT_TYPE_PER_LIST                  S2BIT(47)
+#define TXD_INT_TYPE_UTILZ                     S2BIT(46)
+#define TXD_SET_MARKER                         vBIT(0x6, 0, 4)
 
        u64 Buffer_Pointer;
        u64 Host_Control;       /* reserved for host */
@@ -539,65 +715,112 @@ struct list_info_hold {
 struct RxD_t {
        u64 Host_Control;       /* reserved for host */
        u64 Control_1;
-#define RXD_OWN_XENA            s2BIT(7)
-#define RXD_T_CODE              (s2BIT(12)|s2BIT(13)|s2BIT(14)|s2BIT(15))
-#define RXD_FRAME_PROTO         vBIT(0xFFFF,24,8)
-#define RXD_FRAME_VLAN_TAG      s2BIT(24)
-#define RXD_FRAME_PROTO_IPV4    s2BIT(27)
-#define RXD_FRAME_PROTO_IPV6    s2BIT(28)
-#define RXD_FRAME_IP_FRAG      s2BIT(29)
-#define RXD_FRAME_PROTO_TCP     s2BIT(30)
-#define RXD_FRAME_PROTO_UDP     s2BIT(31)
-#define TCP_OR_UDP_FRAME        (RXD_FRAME_PROTO_TCP | RXD_FRAME_PROTO_UDP)
-#define RXD_GET_L3_CKSUM(val)   ((u16)(val>> 16) & 0xFFFF)
-#define RXD_GET_L4_CKSUM(val)   ((u16)(val) & 0xFFFF)
+#define RXD_OWN_XENA                           S2BIT(7)
+#define RXD_T_CODE                             (S2BIT(12)|S2BIT(13)|\
+                                               S2BIT(14)|S2BIT(15))
+#define GET_RXD_T_CODE(val)                    ((val & RXD_T_CODE) >> 48)
+#define RXD_FRAME_PROTO                                vBIT(0xFFFF, 24, 8)
+#define RXD_FRAME_VLAN_TAG                     S2BIT(24)
+#define RXD_FRAME_PROTO_IPV4                   S2BIT(27)
+#define RXD_FRAME_PROTO_IPV6                   S2BIT(28)
+#define RXD_FRAME_IP_FRAG                      S2BIT(29)
+#define RXD_FRAME_PROTO_TCP                    S2BIT(30)
+#define RXD_FRAME_PROTO_UDP                    S2BIT(31)
+#define RXD_TCP_OR_UDP_FRAME           (RXD_FRAME_PROTO_TCP | \
+                                                                       RXD_FRAME_PROTO_UDP)
+#define RXD_TCP_IPV4_FRAME                     (RXD_FRAME_PROTO_IPV4 | \
+                                                                       RXD_FRAME_PROTO_TCP)
+#define RXD_GET_L3_CKSUM(val)                  ((u16)(val >> 16) & 0xFFFF)
+#define RXD_GET_L4_CKSUM(val)                  ((u16)(val) & 0xFFFF)
 
        u64 Control_2;
-#define        THE_RXD_MARK            0x3
-#define        SET_RXD_MARKER          vBIT(THE_RXD_MARK, 0, 2)
-#define        GET_RXD_MARKER(ctrl)    ((ctrl & SET_RXD_MARKER) >> 62)
+#define        THE_RXD_MARK                            0x3
+#define        SET_RXD_MARKER                          vBIT(THE_RXD_MARK, 0, 2)
+#define        GET_RXD_MARKER(ctrl)                    ((ctrl & SET_RXD_MARKER) >> 62)
 
-#define MASK_VLAN_TAG           vBIT(0xFFFF,48,16)
-#define SET_VLAN_TAG(val)       vBIT(val,48,16)
-#define SET_NUM_TAG(val)       vBIT(val,16,32)
+#define MASK_VLAN_TAG                          vBIT(0xFFFF, 48, 16)
+#define SET_VLAN_TAG(val)                      vBIT(val, 48, 16)
+#define SET_NUM_TAG(val)                       vBIT(val, 16, 32)
+};
 
+#define BUF0_LEN       26
+#define BUF1_LEN       1
 
-};
 /* Rx descriptor structure for 1 buffer mode */
 struct RxD1 {
        struct RxD_t h;
 
-#define MASK_BUFFER0_SIZE_1       vBIT(0x3FFF,2,14)
-#define SET_BUFFER0_SIZE_1(val)   vBIT(val,2,14)
+#define MASK_BUFFER0_SIZE_1                    vBIT(0x3FFF, 2, 14)
+#define SET_BUFFER0_SIZE_1(val)                        vBIT(val, 2, 14)
 #define RXD_GET_BUFFER0_SIZE_1(_Control_2) \
        (u16)((_Control_2 & MASK_BUFFER0_SIZE_1) >> 48)
        u64 Buffer0_ptr;
 };
-/* Rx descriptor structure for 3 or 2 buffer mode */
 
+/* Rx descriptor structure for 3 or 2 buffer mode */
 struct RxD3 {
        struct RxD_t h;
 
-#define MASK_BUFFER0_SIZE_3       vBIT(0xFF,2,14)
-#define MASK_BUFFER1_SIZE_3       vBIT(0xFFFF,16,16)
-#define MASK_BUFFER2_SIZE_3       vBIT(0xFFFF,32,16)
-#define SET_BUFFER0_SIZE_3(val)   vBIT(val,8,8)
-#define SET_BUFFER1_SIZE_3(val)   vBIT(val,16,16)
-#define SET_BUFFER2_SIZE_3(val)   vBIT(val,32,16)
+#define MASK_BUFFER0_SIZE_3                    vBIT(0xFF, 8, 8)
+#define MASK_BUFFER1_SIZE_3                    vBIT(0xFFFF, 16, 16)
+#define MASK_BUFFER2_SIZE_3                    vBIT(0xFFFF, 32, 16)
+#define SET_BUFFER0_SIZE_3(val)                        vBIT(val, 8, 8)
+#define SET_BUFFER1_SIZE_3(val)                        vBIT(val, 16, 16)
+#define SET_BUFFER2_SIZE_3(val)                        vBIT(val, 32, 16)
+
 #define RXD_GET_BUFFER0_SIZE_3(Control_2) \
        (u8)((Control_2 & MASK_BUFFER0_SIZE_3) >> 48)
 #define RXD_GET_BUFFER1_SIZE_3(Control_2) \
        (u16)((Control_2 & MASK_BUFFER1_SIZE_3) >> 32)
 #define RXD_GET_BUFFER2_SIZE_3(Control_2) \
        (u16)((Control_2 & MASK_BUFFER2_SIZE_3) >> 16)
-#define BUF0_LEN       40
-#define BUF1_LEN       1
 
        u64 Buffer0_ptr;
        u64 Buffer1_ptr;
        u64 Buffer2_ptr;
 };
 
+/* Rx descriptor structure for 5 buffer mode */
+struct RxD5 {
+#ifdef __BIG_ENDIAN
+       u32 Host_Control;
+       u32 Control_3;
+#else
+       u32 Control_3;
+       u32 Host_Control;
+#endif
+#define MASK_BUFFER3_SIZE_5                    vBIT(0xFFFF, 32, 16)
+#define SET_BUFFER3_SIZE_5(val)                        vBIT(val, 32, 16)
+#define MASK_BUFFER4_SIZE_5                    vBIT(0xFFFF, 48, 16)
+#define SET_BUFFER4_SIZE_5(val)                        vBIT(val, 48, 16)
+
+#define RXD_GET_BUFFER3_SIZE_5(Control_3) \
+       (u16)((Control_3 & MASK_BUFFER3_SIZE_5) >> 16)
+#define RXD_GET_BUFFER4_SIZE_5(Control_3) \
+       (u16)(Control_3 & MASK_BUFFER4_SIZE_5)
+
+       u64 Control_1;
+       u64 Control_2;
+#define MASK_BUFFER0_SIZE_5                    vBIT(0xFFFF, 0, 16)
+#define MASK_BUFFER1_SIZE_5                    vBIT(0xFFFF, 16, 16)
+#define MASK_BUFFER2_SIZE_5                    vBIT(0xFFFF, 32, 16)
+#define SET_BUFFER0_SIZE_5(val)                        vBIT(val, 0, 16)
+#define SET_BUFFER1_SIZE_5(val)                        vBIT(val, 16, 16)
+#define SET_BUFFER2_SIZE_5(val)                        vBIT(val, 32, 16)
+
+#define RXD_GET_BUFFER0_SIZE_5(Control_2) \
+       (u16)((Control_2 & MASK_BUFFER0_SIZE_5) >> 48)
+#define RXD_GET_BUFFER1_SIZE_5(Control_2) \
+       (u16)((Control_2 & MASK_BUFFER1_SIZE_5) >> 32)
+#define RXD_GET_BUFFER2_SIZE_5(Control_2) \
+       (u16)((Control_2 & MASK_BUFFER2_SIZE_5) >> 16)
+
+       u64 Buffer0_ptr;
+       u64 Buffer1_ptr;
+       u64 Buffer2_ptr;
+       u64 Buffer3_ptr;
+       u64 Buffer4_ptr;
+};
 
 /* Structure that represents the Rx descriptor block which contains
  * 128 Rx descriptors.
@@ -620,12 +843,13 @@ struct RxD_block {
 
 #define RXD_MODE_1     0 /* One Buffer mode */
 #define RXD_MODE_3B    1 /* Two Buffer mode */
+#define RXD_MODE_5     2 /* Five Buffer mode */
 
 /* Structure to hold virtual addresses of Buf0 and Buf1 in
  * 2buf mode. */
 struct buffAdd {
-       void *ba_0_org;
-       void *ba_1_org;
+       void *ba_0_org ____cacheline_aligned;
+       void *ba_1_org ____cacheline_aligned;
        void *ba_0;
        void *ba_1;
 };
@@ -639,14 +863,12 @@ struct buffAdd {
 struct rx_curr_get_info {
        u32 block_index;
        u32 offset;
-       u32 ring_len;
-};
+}____cacheline_aligned;
 
 struct rx_curr_put_info {
        u32 block_index;
        u32 offset;
-       u32 ring_len;
-};
+}____cacheline_aligned;
 
 /* This structure stores the offset of the TxDl in the FIFO
  * from which the Tx Interrupt processor can start picking
@@ -655,17 +877,12 @@ struct rx_curr_put_info {
 struct tx_curr_get_info {
        u32 offset;
        u32 fifo_len;
-};
-
-struct tx_curr_put_info {
-       u32 offset;
-       u32 fifo_len;
-};
+}____cacheline_aligned;
 
 struct rxd_info {
        void *virt_addr;
        dma_addr_t dma_addr;
-};
+}____cacheline_aligned;
 
 /* Structure that holds the Phy and virt addresses of the Blocks */
 struct rx_block_info {
@@ -677,34 +894,88 @@ struct rx_block_info {
 /* Data structure to represent a LRO session */
 struct lro {
        struct sk_buff  *parent;
-       struct sk_buff  *last_frag;
-       u8              *l2h;
+       struct sk_buff  *last_frag;
        struct iphdr    *iph;
        struct tcphdr   *tcph;
        u32             tcp_next_seq;
-       __be32          tcp_ack;
+       u32             tcp_ack;
+       u32             cur_tsval;
+       __be32  cur_tsecr;
        int             total_len;
        int             frags_len;
        int             sg_num;
        int             in_use;
-       __be16          window;
-       u16             vlan_tag;
-       u32             cur_tsval;
-       __be32          cur_tsecr;
+       u16             window;
+       u16             vlan_tag;
        u8              saw_ts;
-} ____cacheline_aligned;
+}____cacheline_aligned;
+
+#define MIN_LRO_PACKETS        2
+#define MAX_LRO_PACKETS        10
+
+#define LRO_AGGR_PACKET                1
+#define LRO_BEG_AGGR           3
+#define LRO_FLUSH_SESSION      4
+#define LRO_FLUSH_BOTH         2
+
+/*
+ * Interrupt count per 10 milliseconds, ie.., 5000 ints/sec.
+ */
+#define MAX_INTERRUPT_COUNT 50
 
 /* Ring specific structure */
 struct ring_info {
-       /* The ring number */
-       int ring_no;
+
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20))
+       /* per-ring atomic ISR counter (used for MSI-X only) */
+       atomic_t        isr_cnt;
+#endif
+
+       /* per-ring ISR counter (used for MSI-X only) */
+       unsigned long long     msix_intr_cnt;
+       unsigned long interrupt_count;
+       unsigned long jiffies;
+
+#define MAX_RX_UFC_A 4
+#define MIN_RX_UFC_A 1
+       unsigned long ufc_a;
+       unsigned long ufc_b;
+       unsigned long ufc_c;
+       unsigned long ufc_d;
+
+       unsigned long urange_a;
+       unsigned long urange_b;
+       unsigned long urange_c;
+
+#define MIN_RX_TIMER_VAL 8
+       int rx_timer_val;
+       int rx_timer_val_saved;
 
        /* per-ring buffer counter */
        u32 rx_bufs_left;
 
-#define MAX_LRO_SESSIONS       32
-       struct lro lro0_n[MAX_LRO_SESSIONS];
+       u8      skbs_per_rxd;
+
+       struct  vlan_group *vlgrp;
+       u8      vlan_strip_flag;
+       u8      rx_steering_type;
+
+        /* per-ring napi flag*/
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
+       struct napi_struct napi;
+#endif
+
+       u8      config_napi;
+       /* The ring number */
+       int ring_no;
+
+       u16 lro_max_aggr_per_sess;
+       int rx_csum;
+#define MAX_LRO_SESSIONS       32
+       struct  lro lro0_n[MAX_LRO_SESSIONS];
        u8              lro;
+       u8              aggr_ack;
+       u8              max_pkts_aggr;
 
        /* copy of sp->rxd_mode flag */
        int rxd_mode;
@@ -721,16 +992,11 @@ struct ring_info {
        /* copy of sp->pdev pointer */
        struct pci_dev *pdev;
 
-       /* Per ring napi struct */
-       struct napi_struct napi;
-
-       unsigned long interrupt_count;
-
        /*
         *  Place holders for the virtual and physical addresses of
         *  all the Rx Blocks
         */
-       struct rx_block_info rx_blocks[MAX_RX_BLOCKS_PER_RING];
+       struct rx_block_info *rx_blocks ____cacheline_aligned;
        int block_count;
        int pkt_cnt;
 
@@ -747,24 +1013,28 @@ struct ring_info {
        struct rx_curr_get_info rx_curr_get_info;
 
        /* interface MTU value */
-        unsigned mtu;
+       unsigned mtu;
 
-       /* Buffer Address store. */
+       /* Buffer Address store. Used for 2 buffer mode. */
        struct buffAdd **ba;
 
+       /*
+        * On 64 bit platforms for 5 buf mode we need to store the skb pointers,
+        * as we can't save them in RxD Host_Control field which is 32 bit.
+        */
+       u64 *skbs;
+
        /* per-Ring statistics */
        unsigned long rx_packets;
        unsigned long rx_bytes;
-} ____cacheline_aligned;
 
-/* Fifo specific structure */
-struct fifo_info {
-       /* FIFO number */
-       int fifo_no;
+        /*per-ring ethtool stats*/
+       struct rxRingStat *rx_ring_stat;
 
-       /* Maximum TxDs per TxDL */
-       int max_txds;
+} ring_info_t ____cacheline_aligned;
 
+/* Fifo specific structure */
+struct fifo_info {
        /* Place holder of all the TX List's Phy and Virt addresses. */
        struct list_info_hold *list_info;
 
@@ -772,31 +1042,44 @@ struct fifo_info {
         * Current offset within the tx FIFO where driver would write
         * new Tx frame
         */
-       struct tx_curr_put_info tx_curr_put_info;
+       struct tx_curr_get_info tx_curr_put_info;
 
        /*
         * Current offset within tx FIFO from where the driver would start freeing
         * the buffers
         */
        struct tx_curr_get_info tx_curr_get_info;
+
+       spinlock_t tx_lock;
 #define FIFO_QUEUE_START 0
 #define FIFO_QUEUE_STOP 1
+       /* flag used to maintain queue state when MULTIQ is not enabled */
        int queue_state;
 
+       struct s2io_nic *nic;
+
        /* copy of sp->dev pointer */
        struct net_device *dev;
 
+       /* FIFO number */
+       int fifo_no;
+
+       /* Maximum TxDs per TxDL */
+       int max_txds;
+
+       /* copy of interrupt type */
+       u8 intr_type;
+
        /* copy of multiq status */
        u8 multiq;
 
-       /* Per fifo lock */
-       spinlock_t tx_lock;
-
-       /* Per fifo UFO in band structure */
+#ifdef NETIF_F_UFO
        u64 *ufo_in_band_v;
+#endif
+       /*per-fifo ethtool stats*/
+       struct txFifoStat *tx_fifo_stat;
 
-       struct s2io_nic *nic;
-} ____cacheline_aligned;
+}____cacheline_aligned;
 
 /* Information related to the Tx and Rx FIFOs and Rings of Xena
  * is maintained in this structure.
@@ -809,9 +1092,6 @@ struct mac_info {
        /* Fifo specific structure */
        struct fifo_info fifos[MAX_TX_FIFOS];
 
-       /* Save virtual address of TxD page with zero DMA addr(if any) */
-       void *zerodma_virt_addr;
-
 /* rx side stuff */
        /* Ring specific structure */
        struct ring_info rings[MAX_RX_RINGS];
@@ -823,20 +1103,11 @@ struct mac_info {
        void *stats_mem;        /* orignal pointer to allocated mem */
        dma_addr_t stats_mem_phy;       /* Physical address of the stat block */
        u32 stats_mem_sz;
-       struct stat_block *stats_info;  /* Logical address of the stat block */
-};
+       struct stat_block *stats_info;  /* Logical address of the stat block */
+}____cacheline_aligned;
 
-/* structure representing the user defined MAC addresses */
-struct usr_addr {
-       char addr[ETH_ALEN];
-       int usage_cnt;
-};
 
-/* Default Tunable parameters of the NIC. */
-#define DEFAULT_FIFO_0_LEN 4096
-#define DEFAULT_FIFO_1_7_LEN 512
-#define SMALL_BLK_CNT  30
-#define LARGE_BLK_CNT  100
+#define SMALL_BLK_CNT  10
 
 /*
  * Structure to keep track of the MSI-X vectors and the corresponding
@@ -850,8 +1121,8 @@ struct s2io_msix_entry
        void *arg;
 
        u8 type;
-#define        MSIX_ALARM_TYPE         1
-#define        MSIX_RING_TYPE          2
+#define        MSIX_ALARM_TYPE 1       /* This is used for handling MSI-TX */
+#define        MSIX_RING_TYPE  2
 
        u8 in_use;
 #define MSIX_REGISTERED_SUCCESS        0xAA
@@ -862,10 +1133,36 @@ struct msix_info_st {
        u64 data;
 };
 
+/* SPDM related data */
+#define MAX_SUPPORTED_SPDM_ENTRIES 256
+struct spdm_entry{
+       u64 port_n_entry_control_0;
+#define SPDM_PGM_L4_SRC_PORT(port)             vBIT(port, 0, 16)
+#define SPDM_PGM_L4_DST_PORT(port)             vBIT(port, 16, 16)
+#define SPDM_PGM_TARGET_QUEUE(queue)           vBIT(queue, 53, 3)
+#define SPDM_PGM_IS_TCP                                S2BIT(59)
+#define SPDM_PGM_IS_IPV4                       S2BIT(63)
+
+       union {
+               u64 ipv4_sa_da;
+               u64 ipv6_sa_p0;
+       } ip;
+       u64 ipv6_sa_p1;
+       u64 ipv6_da_p0;
+       u64 ipv6_da_p1;
+       u64 rsvd_3;
+       u64 rsvd_4;
+
+       u64 hash_n_entry_control_1;
+#define SPDM_PGM_HASH(hash)                    vBIT(hash, 0, 32)
+#define SPDM_PGM_ENABLE_ENTRY                  S2BIT(63)
+};
+
 /* These flags represent the devices temporary state */
 enum s2io_device_state_t
 {
-       __S2IO_STATE_LINK_TASK=0,
+       __S2IO_STATE_LINK_RESET_TASK = 0,
+       __S2IO_STATE_RESET_CARD,
        __S2IO_STATE_CARD_UP
 };
 
@@ -873,9 +1170,10 @@ enum s2io_device_state_t
 struct s2io_nic {
        int rxd_mode;
        /*
-        * Count of packets to be processed in a given iteration, it will be indicated
-        * by the quota field of the device structure when NAPI is enabled.
-        */
+       * Count of packets to be processed in a given iteration, it will be
+       * indicated by the quota field of the device structure when
+       * NAPI is enabled.
+       */
        int pkts_to_process;
        struct net_device *dev;
        struct mac_info mac_control;
@@ -883,11 +1181,11 @@ struct s2io_nic {
        struct pci_dev *pdev;
        void __iomem *bar0;
        void __iomem *bar1;
-#define MAX_MAC_SUPPORTED   16
-#define MAX_SUPPORTED_MULTICASTS MAX_MAC_SUPPORTED
 
+       /* Number of skbs allocated for each RxD. Valid only in case of
+       * 5 buffer mode
+       */
        struct mac_addr def_mac_addr[256];
-
        struct net_device_stats stats;
        int high_dma_flag;
        int device_enabled_once;
@@ -903,10 +1201,7 @@ struct s2io_nic {
 #define PROMISC     1
 #define ALL_MULTI   2
 
-#define MAX_ADDRS_SUPPORTED 64
-       u16 usr_addr_count;
        u16 mc_addr_count;
-       struct usr_addr usr_addrs[256];
 
        u16 m_cast_flg;
        u16 all_multi_pos;
@@ -919,15 +1214,23 @@ struct s2io_nic {
         *  a schedule task that will set the correct Link state once the
         *  NIC's PHY has stabilized after a state change.
         */
+#ifdef INIT_TQUEUE
+       struct tq_struct rst_timer_task;
+       struct tq_struct set_link_task;
+#else
        struct work_struct rst_timer_task;
        struct work_struct set_link_task;
+#endif
 
        /* Flag that can be used to turn on or turn off the Rx checksum
         * offload feature.
         */
        int rx_csum;
 
-       /* Below variables are used for fifo selection to transmit a packet */
+       /*  Below variables are used for fifo selection to transmit a packet */
+
+       u8 fifo_mapping[MAX_TX_FIFOS];
+
        u16 fifo_selector[MAX_TX_FIFOS];
 
        /* Total fifos for tcp packets */
@@ -948,50 +1251,72 @@ struct s2io_nic {
        */
        u8 other_fifo_idx;
 
-       struct napi_struct napi;
-       /*  after blink, the adapter must be restored with original
-        *  values.
-        */
-       u64 adapt_ctrl_org;
-
        /* Last known link state. */
        u16 last_link_state;
 #define        LINK_DOWN       1
 #define        LINK_UP         2
 
-       int task_flag;
+       u8 exec_mode;
+       u8 serious_err;
        unsigned long long start_time;
+#ifdef SNMP_SUPPORT
+       char cName[20];
+       u64 nMemorySize;
+       int nLinkStatus;
+       int nFeature;
+       char cVersion[20];
+       long lDate;
+#endif
        struct vlan_group *vlgrp;
-#define MSIX_FLG                0xA5
+#define S2IO_INVALID_RING      0xFFFF
+       u16 *vlan_array;
+       u8 vlan_added;
+#define MSIX_FLG               0xA5
+#ifdef CONFIG_PCI_MSI
        int num_entries;
        struct msix_entry *entries;
        int msi_detected;
        wait_queue_head_t msi_wait;
+#endif
        struct s2io_msix_entry *s2io_entries;
        char desc[MAX_REQUESTED_MSI_X][25];
 
-       int avail_msix_vectors; /* No. of MSI-X vectors granted by system */
-
-       struct msix_info_st msix_info[0x3f];
+       struct msix_info_st msix_info[MAX_REQUESTED_MSI_X];
 
 #define XFRAME_I_DEVICE                1
 #define XFRAME_II_DEVICE       2
-       u8 device_type;
+#ifdef TITAN_LEGACY
+#define TITAN_DEVICE           3
+#endif
 
-       unsigned long   clubbed_frms_cnt;
-       unsigned long   sending_both;
-       u8              lro;
-       u16             lro_max_aggr_per_sess;
+       u8 device_type;
+       u8 lro;
+       u16 lro_max_aggr_per_sess;
        volatile unsigned long state;
-       u64             general_int_mask;
+       unsigned long long tx_intr_cnt;
+       unsigned long long rx_intr_cnt;
+       u64 general_int_mask;
+       int spdm_entry;
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 20))
+       /* Tx fifo ISR counter (used for MSI-X only) */
+       atomic_t        isr_cnt;
+#endif
+
+
+       struct xpakStat *xpak_stat;
+       struct swErrStat *sw_err_stat;
+       struct swDbgStat *sw_dbg_stat;
 
 #define VPD_STRING_LEN 80
        u8  product_name[VPD_STRING_LEN];
        u8  serial_num[VPD_STRING_LEN];
-};
+       u8  vlan_strip_flag;
+
+#ifdef RX_ERR_DBG
+int ecc_flag;
+#endif
 
-#define RESET_ERROR 1;
-#define CMD_ERROR   2;
+}____cacheline_aligned;
 
 /*  OS related system calls */
 #ifndef readq
@@ -1030,10 +1355,10 @@ static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order)
                writel((u32) (val), addr);
                ret = readl(addr);
                writel((u32) (val >> 32), (addr + 4));
-               ret = readl(addr + 4);
+               ret = readl((addr + 4));
        } else {
                writel((u32) (val >> 32), (addr + 4));
-               ret = readl(addr + 4);
+               ret = readl((addr + 4));
                writel((u32) (val), addr);
                ret = readl(addr);
        }
@@ -1045,52 +1370,52 @@ static inline void SPECIAL_REG_WRITE(u64 val, void __iomem *addr, int order)
 #define DISABLE_INTRS   2
 
 /*  Highest level interrupt blocks */
-#define TX_PIC_INTR     (0x0001<<0)
-#define TX_DMA_INTR     (0x0001<<1)
-#define TX_MAC_INTR     (0x0001<<2)
-#define TX_XGXS_INTR    (0x0001<<3)
-#define TX_TRAFFIC_INTR (0x0001<<4)
-#define RX_PIC_INTR     (0x0001<<5)
-#define RX_DMA_INTR     (0x0001<<6)
-#define RX_MAC_INTR     (0x0001<<7)
-#define RX_XGXS_INTR    (0x0001<<8)
-#define RX_TRAFFIC_INTR (0x0001<<9)
-#define MC_INTR         (0x0001<<10)
-#define ENA_ALL_INTRS    (   TX_PIC_INTR     | \
-                            TX_DMA_INTR     | \
-                            TX_MAC_INTR     | \
-                            TX_XGXS_INTR    | \
-                            TX_TRAFFIC_INTR | \
-                            RX_PIC_INTR     | \
-                            RX_DMA_INTR     | \
-                            RX_MAC_INTR     | \
-                            RX_XGXS_INTR    | \
-                            RX_TRAFFIC_INTR | \
-                            MC_INTR )
+#define TX_PIC_INTR                    (0x0001<<0)
+#define TX_DMA_INTR                    (0x0001<<1)
+#define TX_MAC_INTR                    (0x0001<<2)
+#define TX_XGXS_INTR                   (0x0001<<3)
+#define TX_TRAFFIC_INTR                        (0x0001<<4)
+#define RX_PIC_INTR                    (0x0001<<5)
+#define RX_DMA_INTR                    (0x0001<<6)
+#define RX_MAC_INTR                    (0x0001<<7)
+#define RX_XGXS_INTR                   (0x0001<<8)
+#define RX_TRAFFIC_INTR                        (0x0001<<9)
+#define MC_INTR                                (0x0001<<10)
+#define ENA_ALL_INTRS                  (TX_PIC_INTR | \
+                                       TX_DMA_INTR | \
+                                       TX_MAC_INTR | \
+                                       TX_XGXS_INTR | \
+                                       TX_TRAFFIC_INTR | \
+                                       RX_PIC_INTR | \
+                                       RX_DMA_INTR | \
+                                       RX_MAC_INTR | \
+                                       RX_XGXS_INTR | \
+                                       RX_TRAFFIC_INTR | \
+                                       MC_INTR)
 
 /*  Interrupt masks for the general interrupt mask register */
 #define DISABLE_ALL_INTRS   0xFFFFFFFFFFFFFFFFULL
 
-#define TXPIC_INT_M         s2BIT(0)
-#define TXDMA_INT_M         s2BIT(1)
-#define TXMAC_INT_M         s2BIT(2)
-#define TXXGXS_INT_M        s2BIT(3)
-#define TXTRAFFIC_INT_M     s2BIT(8)
-#define PIC_RX_INT_M        s2BIT(32)
-#define RXDMA_INT_M         s2BIT(33)
-#define RXMAC_INT_M         s2BIT(34)
-#define MC_INT_M            s2BIT(35)
-#define RXXGXS_INT_M        s2BIT(36)
-#define RXTRAFFIC_INT_M     s2BIT(40)
+#define TXPIC_INT_M                    S2BIT(0)
+#define TXDMA_INT_M                    S2BIT(1)
+#define TXMAC_INT_M                    S2BIT(2)
+#define TXXGXS_INT_M                   S2BIT(3)
+#define TXTRAFFIC_INT_M                        S2BIT(8)
+#define PIC_RX_INT_M                   S2BIT(32)
+#define RXDMA_INT_M                    S2BIT(33)
+#define RXMAC_INT_M                    S2BIT(34)
+#define MC_INT_M                       S2BIT(35)
+#define RXXGXS_INT_M                   S2BIT(36)
+#define RXTRAFFIC_INT_M                        S2BIT(40)
 
 /*  PIC level Interrupts TODO*/
 
 /*  DMA level Inressupts */
-#define TXDMA_PFC_INT_M     s2BIT(0)
-#define TXDMA_PCC_INT_M     s2BIT(2)
+#define TXDMA_PFC_INT_M                        S2BIT(0)
+#define TXDMA_PCC_INT_M                        S2BIT(2)
 
 /*  PFC block interrupts */
-#define PFC_MISC_ERR_1      s2BIT(0)   /* Interrupt to indicate FIFO full */
+#define PFC_MISC_ERR_1                 S2BIT(0) /* FIFO full Interrupt */
 
 /* PCC block interrupts. */
 #define        PCC_FB_ECC_ERR     vBIT(0xff, 16, 8)    /* Interrupt to indicate
@@ -1107,67 +1432,189 @@ static int init_shared_mem(struct s2io_nic *sp);
 static void free_shared_mem(struct s2io_nic *sp);
 static int init_nic(struct s2io_nic *nic);
 static int rx_intr_handler(struct ring_info *ring_data, int budget);
-static void s2io_txpic_intr_handle(struct s2io_nic *sp);
 static void tx_intr_handler(struct fifo_info *fifo_data);
-static void s2io_handle_errors(void * dev_id);
-
+static void s2io_handle_errors(void *dev_id);
 static int s2io_starter(void);
 static void s2io_closer(void);
 static void s2io_tx_watchdog(struct net_device *dev);
 static void s2io_set_multicast(struct net_device *dev);
-static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp);
-static void s2io_link(struct s2io_nic * sp, int link);
-static void s2io_reset(struct s2io_nic * sp);
-static int s2io_poll_msix(struct napi_struct *napi, int budget);
-static int s2io_poll_inta(struct napi_struct *napi, int budget);
-static void s2io_init_pci(struct s2io_nic * sp);
+static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t *rxdp);
+static void s2io_link(struct s2io_nic *sp, int link);
+static void s2io_reset(struct s2io_nic *sp);
+#if defined(HAVE_NETDEV_POLL)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
+static int s2io_poll(struct napi_struct *napi, int budget);
+#else
+static int s2io_poll(struct net_device *dev, int *budget);
+#endif
+#endif
+static void s2io_init_pci(struct s2io_nic *sp);
 static int do_s2io_prog_unicast(struct net_device *dev, u8 *addr);
 static void s2io_alarm_handle(unsigned long data);
+#ifndef SET_ETHTOOL_OPS
+static int s2io_ethtool(struct net_device *dev, struct ifreq *rq);
+#endif
+#ifdef CONFIG_PCI_MSI
+static void store_xmsi_data(struct s2io_nic *nic);
+static void restore_xmsi_data(struct s2io_nic *nic);
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19))
 static irqreturn_t
-s2io_msix_ring_handle(int irq, void *dev_id);
+s2io_msix_ring_handle(int irq, void *dev_id, struct pt_regs *regs);
 static irqreturn_t
-s2io_msix_fifo_handle(int irq, void *dev_id);
+s2io_msix_fifo_handle(int irq, void *dev_id, struct pt_regs *regs);
+#else
+static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id);
+static irqreturn_t s2io_msix_fifo_handle(int irq, void *dev_id);
+#endif
+static int s2io_enable_msi_x(struct s2io_nic *nic);
+#endif
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19))
+static irqreturn_t s2io_isr(int irq, void *dev_id, struct pt_regs *regs);
+#else
 static irqreturn_t s2io_isr(int irq, void *dev_id);
+#endif
 static int verify_xena_quiescence(struct s2io_nic *sp);
+#ifdef SET_ETHTOOL_OPS
 static const struct ethtool_ops netdev_ethtool_ops;
+#endif
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 19))
+static void s2io_set_link(unsigned long data);
+#else
 static void s2io_set_link(struct work_struct *work);
-static int s2io_set_swapper(struct s2io_nic * sp);
+#endif
+static int s2io_set_swapper(struct s2io_nic *sp);
 static void s2io_card_down(struct s2io_nic *nic);
 static int s2io_card_up(struct s2io_nic *nic);
-static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit,
-                                       int bit_state);
-static int s2io_add_isr(struct s2io_nic * sp);
-static void s2io_rem_isr(struct s2io_nic * sp);
+static int get_xena_rev_id(struct pci_dev *pdev);
+static int spdm_extract_table(void *data, struct s2io_nic *nic);
+static int spdm_configure(struct s2io_nic *nic, struct spdm_cfg *info);
+static int wait_for_cmd_complete(void *addr, u64 busy_bit, int bit_state);
+static int s2io_add_isr(struct s2io_nic *sp);
+static void s2io_rem_isr(struct s2io_nic *sp);
+#ifdef CONFIG_PM
+static int s2io_pm_suspend(struct pci_dev *pdev, pm_message_t state);
+static int s2io_pm_resume(struct pci_dev *pdev);
+#endif
+
+#ifdef SNMP_SUPPORT
 
+#define S2IODIRNAME            "S2IO"
+#define BDFILENAME             "BDInfo"
+#define PADAPFILENAME          "PhyAdap"
+#define ERROR_PROC_DIR         -20
+#define ERROR_PROC_ENTRY       -21
+
+struct stDrvData {
+       struct stBaseDrv *pBaseDrv;
+};
+
+struct stPhyAdap {
+       int m_nIndex;
+       char m_cName[20];
+};
+struct stBaseDrv {
+       char m_cName[21];
+       int m_nStatus;
+       char m_cVersion[21];
+       int m_nFeature;
+       unsigned long long m_nMemorySize;
+       char m_cDate[21];
+       int m_nPhyCnt;
+       char m_cPhyIndex[21];
+       int m_dev_id;
+       int m_ven_id;
+       u32 m_tx_intr_cnt;
+       u32 m_rx_intr_cnt;
+       u32 m_intr_type;
+       u32 m_tx_fifo_num;
+       u32 m_rx_ring_num;
+       int m_rxd_mode;
+       u8  m_lro;
+       u16 m_lro_max_pkts;
+       u8 m_napi;
+       u8 m_rx_steering_type;
+       int m_vlan_tag_strip;
+       int m_rx_csum;
+       int m_tx_csum;
+       int m_sg;
+       int m_ufo;
+       int m_tso;
+       int m_fifo_len;
+       int m_rx_ring_size;
+       int m_rth_bucket_size;
+       u64 m_tx_urng;
+       u64 m_rx_urng;
+       u64 m_tx_ufc;
+       u64 m_rx_ufc;
+       struct stPhyAdap m_stPhyAdap[5];
+};
+
+struct stPhyData {
+       int m_nIndex;
+       unsigned char m_cDesc[20];
+       int m_nMode;
+       int m_nType;
+       char m_cSpeed[20];
+       unsigned char m_cPMAC[20];
+       unsigned char m_cCMAC[20];
+       int m_nLinkStatus;
+       int m_nPCISlot;
+       int m_nPCIBus;
+       int m_nIRQ;
+       int m_nCollision;
+       int m_nMulticast;
+
+       unsigned long long m_nRxBytes;
+       unsigned long long m_nRxDropped;
+       unsigned long long m_nRxErrors;
+       unsigned long long m_nRxPackets;
+       unsigned long long m_nTxBytes;
+       unsigned long long m_nTxDropped;
+       unsigned long long m_nTxErrors;
+       unsigned long long m_nTxPackets;
+};
+
+static int s2io_bdsnmp_init(struct net_device *dev);
+static void s2io_bdsnmp_rem(struct net_device *dev);
+#endif
+
+static int s2io_club_tcp_session(struct ring_info *ring, u8 *buffer, u8 **tcp,
+       u32 *tcp_len, struct lro **lro, struct RxD_t *rxdp, u16 vid);
+static void clear_lro_session(struct lro *lro);
+static void queue_rx_frame(struct sk_buff *skb, struct ring_info *ring,
+       u16 vlan_tag);
+static void update_L3L4_header(struct ring_info *ring, struct lro *lro,
+int ring_no);
+static void lro_append_pkt(struct ring_info *ring, struct lro *lro,
+       struct sk_buff *skb, u32 tcp_len, u8 aggr_ack);
+static void amd_8132_update_hyper_tx(u8 set_reset);
+
+#ifdef CONFIG_PCI_MSI
 static void restore_xmsi_data(struct s2io_nic *nic);
+#endif
 static void do_s2io_store_unicast_mc(struct s2io_nic *sp);
 static void do_s2io_restore_unicast_mc(struct s2io_nic *sp);
 static u64 do_s2io_read_unicast_mc(struct s2io_nic *sp, int offset);
 static int do_s2io_add_mc(struct s2io_nic *sp, u8 *addr);
-static int do_s2io_add_mac(struct s2io_nic *sp, u64 addr, int offset);
+static int do_s2io_add_mac(struct s2io_nic *sp, u64 addr, int off);
 static int do_s2io_delete_unicast_mc(struct s2io_nic *sp, u64 addr);
-
-static int s2io_club_tcp_session(struct ring_info *ring_data, u8 *buffer,
-       u8 **tcp, u32 *tcp_len, struct lro **lro, struct RxD_t *rxdp,
-       struct s2io_nic *sp);
-static void clear_lro_session(struct lro *lro);
-static void queue_rx_frame(struct sk_buff *skb, u16 vlan_tag);
-static void update_L3L4_header(struct s2io_nic *sp, struct lro *lro);
-static void lro_append_pkt(struct s2io_nic *sp, struct lro *lro,
-                          struct sk_buff *skb, u32 tcp_len);
-static int rts_ds_steer(struct s2io_nic *nic, u8 ds_codepoint, u8 ring);
-
+static void print_static_param_list(struct net_device *dev);
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 21))
 static pci_ers_result_t s2io_io_error_detected(struct pci_dev *pdev,
-                                             pci_channel_state_t state);
+                                               pci_channel_state_t state);
 static pci_ers_result_t s2io_io_slot_reset(struct pci_dev *pdev);
 static void s2io_io_resume(struct pci_dev *pdev);
-
+#endif
+#ifdef NETIF_F_GSO
 #define s2io_tcp_mss(skb) skb_shinfo(skb)->gso_size
 #define s2io_udp_mss(skb) skb_shinfo(skb)->gso_size
 #define s2io_offload_type(skb) skb_shinfo(skb)->gso_type
+#endif
 
+#ifdef module_param
 #define S2IO_PARM_INT(X, def_val) \
        static unsigned int X = def_val;\
                module_param(X , uint, 0);
+#endif
 
 #endif                         /* _S2IO_H */
diff --git a/drivers/net/s2io/kcompat.h b/drivers/net/s2io/kcompat.h
new file mode 100644 (file)
index 0000000..00700ad
--- /dev/null
@@ -0,0 +1,281 @@
+#ifndef _KCOMPAT_H_
+#define _KCOMPAT_H_
+
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,16))
+#include <linux/config.h>
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+#include<linux/tqueue.h>
+#else
+#include <linux/moduleparam.h>
+#include<linux/workqueue.h>
+#endif
+
+/* VENDOR and DEVICE ID of XENA. */
+#ifndef PCI_VENDOR_ID_S2IO
+#define PCI_VENDOR_ID_S2IO      0x17D5
+#define PCI_DEVICE_ID_S2IO_WIN  0x5731
+#define PCI_DEVICE_ID_S2IO_UNI  0x5831
+#endif
+
+#ifndef PCI_DEVICE_ID_HERC_WIN
+#define PCI_DEVICE_ID_HERC_WIN  0x5732
+#define PCI_DEVICE_ID_HERC_UNI  0x5832
+#endif
+
+#ifndef PCI_DEVICE_ID_TITAN
+#define PCI_DEVICE_ID_TITAN_WIN  0x5733
+#define PCI_DEVICE_ID_TITAN_UNI  0x5833
+#endif
+
+#ifndef PCI_DEVICE_ID_AMD_8132_BRIDGE
+#define PCI_DEVICE_ID_AMD_8132_BRIDGE  0x7458
+#endif
+
+/* Ethtool related variables and Macros. */
+#ifndef SET_ETHTOOL_OPS
+static int s2io_ethtool(struct net_device *dev, struct ifreq *rq);
+#define SPEED_10000 10000
+#endif
+
+#ifndef DMA_ERROR_CODE
+#define DMA_ERROR_CODE          (~(dma_addr_t)0x0)
+#endif
+
+/*
+ * Macros for msleep and msleep_interruptible for kernel versions in which
+ * they are not defined.
+ */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8) )
+#define msleep(x)       do { set_current_state(TASK_UNINTERRUPTIBLE); \
+                                schedule_timeout((x * HZ)/1000 + 2); \
+                        } while(0)
+#endif
+
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) )
+#define proc_net       init_net.proc_net
+#endif
+
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9) )
+#define msleep_interruptible(x) do {set_current_state(TASK_INTERRUPTIBLE); \
+                                        schedule_timeout((x * HZ)/1000); \
+                                } while(0)
+#endif
+
+/* Use pci_name instead of slot_name for kernel versions > 2.4.22 */
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,4,22) )
+#define pci_name(x)     ((x)->slot_name)
+#endif
+
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5) )
+#define pci_dma_sync_single_for_cpu(pdev, dma_addr, len, dir) \
+       pci_dma_sync_single((pdev), (dma_addr), (len), (dir))
+
+#define pci_dma_sync_single_for_device(pdev, dma_addr, len, dir) \
+       pci_dma_sync_single((pdev), (dma_addr), (len), (dir))
+#endif
+
+
+/* pci_save_state */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
+#define pci_save_state(x,y)    pci_save_state(x)
+#endif
+
+/* pci_restore_state */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,10))
+#define pci_restore_state(x,y) pci_restore_state(x);
+#endif
+
+/* synchronize_irq */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,28))
+#define s2io_synchronize_irq(x)                synchronize_irq()
+#else
+#define s2io_synchronize_irq(x)                synchronize_irq(x)
+#endif
+
+/* pci_dev_put */
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0))
+#define pci_dev_put(x)
+#endif
+
+/* Macros to ensure the code is backward compatible with 2.4.x kernels. */
+#ifndef NET_IP_ALIGN
+#define NET_IP_ALIGN 2
+#endif
+
+#ifndef SET_NETDEV_DEV
+#define SET_NETDEV_DEV(a, b)    do {} while(0)
+#endif
+
+#ifndef HAVE_FREE_NETDEV
+#define free_netdev(x) kfree(x)
+#endif
+
+#ifndef IRQ_NONE
+typedef void irqreturn_t;
+#define IRQ_NONE
+#define IRQ_HANDLED
+#define IRQ_RETVAL(x)
+#endif
+
+#ifdef INIT_TQUEUE
+#define schedule_work schedule_task
+#define flush_scheduled_work flush_scheduled_tasks
+#define INIT_WORK INIT_TQUEUE
+#endif
+
+#ifndef __iomem
+#define __iomem
+#endif
+
+#ifndef DMA_64BIT_MASK
+#define DMA_64BIT_MASK  0xffffffffffffffffULL
+#define DMA_32BIT_MASK  0x00000000ffffffffULL
+#endif
+
+#ifndef S2IO_ALIGN
+#define S2IO_ALIGN(x,a) (((x)+(a)-1)&~((a)-1))
+#endif
+
+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) )
+#define GET_SOCK_SLEEP_CALLBACK(sk)     sk->sleep
+#define GET_SOCK_SOCKET_DESC(sk)        sk->socket
+#else
+#define GET_SOCK_SLEEP_CALLBACK(sk)     sk->sk_sleep
+#define GET_SOCK_SOCKET_DESC(sk)        sk->sk_socket
+#endif
+
+#ifndef module_param
+#define S2IO_PARM_INT(X, def_val) \
+        static unsigned int X = def_val;\
+               MODULE_PARM(X, "i");
+#endif
+
+#ifndef SKB_GSO_TCPV4
+#define SKB_GSO_TCPV4  0x1
+#endif
+
+#ifndef SKB_GSO_UDP
+#define SKB_GSO_UDP            0x2
+#endif
+
+#ifndef SKB_GSO_UDPV4
+#define SKB_GSO_UDPV4  0x2
+#endif
+
+#ifndef SKB_GSO_TCPV6
+#define SKB_GSO_TCPV6  0x10
+#endif
+
+#ifndef NETIF_F_GSO
+
+#ifdef NETIF_F_TSO
+#define s2io_tcp_mss(skb) skb_shinfo(skb)->tso_size
+#else
+#define s2io_tcp_mss(skb) 0
+#endif
+
+#ifdef  NETIF_F_UFO
+#define s2io_udp_mss(skb) skb_shinfo(skb)->ufo_size
+#else
+#define s2io_udp_mss(skb) 0
+#endif
+
+inline int s2io_offload_type(struct sk_buff *skb)
+{
+#ifdef NETIF_F_TSO
+       if (skb_shinfo(skb)->tso_size)
+               return SKB_GSO_TCPV4;
+#endif
+#ifdef  NETIF_F_UFO
+       else if(skb_shinfo(skb)->ufo_size)
+               return SKB_GSO_UDP;
+#endif
+       return 0;
+}
+#endif
+#ifndef NETIF_F_TSO6
+#define s2io_ethtool_op_get_tso ethtool_op_get_tso
+#define s2io_ethtool_op_set_tso ethtool_op_set_tso
+#endif
+#ifndef IRQF_SHARED
+#define IRQF_SHARED SA_SHIRQ
+#endif
+
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15))
+#undef CONFIG_PM
+#endif
+
+#ifndef CHECKSUM_PARTIAL
+#define CHECKSUM_PARTIAL CHECKSUM_HW
+#endif
+
+/* Macros to ensure the code is backward compatible with 2.6.5 kernels. */
+#ifndef  spin_trylock_irqsave
+#define spin_trylock_irqsave(lock, flags) \
+({ \
+       local_irq_save(flags); \
+       spin_trylock(lock) ? \
+       1 : ({ local_irq_restore(flags); 0; }); \
+})
+
+#ifndef NETDEV_TX_LOCKED
+#define NETDEV_TX_LOCKED -1    /* driver tx lock was already taken */
+#endif
+#endif
+
+#ifndef NETDEV_TX_BUSY
+#define NETDEV_TX_BUSY 1
+#endif
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,21)
+#define S2IO_SKB_INIT_TAIL(frag_list, val) \
+       skb_reset_tail_pointer(frag_list)
+#else
+#define S2IO_SKB_INIT_TAIL(frag_list, val) \
+       frag_list->tail = (void *) (unsigned long)val
+#endif
+
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,20))
+#define S2IO_PCI_FIND_DEVICE(_a, _b, _c) \
+        pci_find_device(_a, _b, _c)
+#else
+#define S2IO_PCI_FIND_DEVICE(_a, _b, _c) \
+        pci_get_device(_a, _b, _c)
+#endif
+
+#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,20))
+#define S2IO_PCI_PUT_DEVICE(_a)
+#else
+#define S2IO_PCI_PUT_DEVICE(_a) \
+        pci_dev_put(_a)
+#endif
+
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9))
+#ifndef __be32
+#define __be32 u32
+#endif
+#endif
+
+inline u16 s2io_get_tx_priority(struct sk_buff *skb, u16 vlan_tag)
+{
+       u16 ret = 0;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24)
+       ret = (skb->priority & 0x7);
+#else 
+       if (vlan_tag) 
+               ret = ((vlan_tag >> 13) & 0x7);
+       else if (skb->protocol == htons(ETH_P_IP)) {
+               struct iphdr *ip;
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22))
+               ip = ip_hdr(skb);
+#else
+               ip = skb->nh.iph;
+#endif
+               ret = ((IPTOS_TOS(ip->tos) >> 1) >> 1);
+       }
+#endif
+       return ret;
+}
+
+#endif /* _KCOMPAT_H_ */
diff --git a/drivers/net/s2io/spdm_cfg.h b/drivers/net/s2io/spdm_cfg.h
new file mode 100644 (file)
index 0000000..6592825
--- /dev/null
@@ -0,0 +1,29 @@
+/* A SPDM config structure to pass info the driver by user */\r
+struct spdm_cfg {\r
+       unsigned int    sip; /* Src IP addr */\r
+       unsigned int    dip; /* Dst IP addr */\r
+       unsigned short  sprt; /* Src TCP port */\r
+       unsigned short  dprt; /* Dst TCP port */\r
+       unsigned int    t_queue; /*Target Rx Queue for the packet */\r
+       unsigned int    hash; /* the hash as per jenkin's hash algorithm. */\r
+#define SPDM_NO_DATA                   0x1\r
+#define SPDM_XENA_IF                   0x2\r
+#define SPDM_HW_UNINITIALIZED          0x3\r
+#define SPDM_INCOMPLETE_SOCKET         0x4\r
+#define SPDM_TABLE_ACCESS_FAILED       0x5\r
+#define SPDM_TABLE_FULL                        0x6\r
+#define SPDM_TABLE_UNKNOWN_BAR         0x7\r
+#define SPDM_TABLE_MALLOC_FAIL         0x8\r
+#define        SPDM_INVALID_DEVICE             0x9\r
+#define SPDM_CONF_SUCCESS              0x0\r
+#define SPDM_CLR_SUCCESS               0xA\r
+#define SPDM_CLR_FAIL                  0xB\r
+#define        SPDM_GET_CFG_DATA               0xAA55\r
+#define        SPDM_GET_CLR_DATA               0xAAA555\r
+       int             ret;\r
+#define MAX_SPDM_ENTRIES_SIZE  (0x100 * 0x40)\r
+       unsigned char   data[MAX_SPDM_ENTRIES_SIZE];\r
+       int             data_len; /* Number of entries retrieved */\r
+       char            dev_name[20];   /* Device name, e.g. eth0, eth1... */\r
+};\r
+\r
diff --git a/drivers/net/s2io/util.h b/drivers/net/s2io/util.h
new file mode 100644 (file)
index 0000000..b94353a
--- /dev/null
@@ -0,0 +1,64 @@
+struct generalInfo {
+       unsigned long deviceid;
+       unsigned long vendorid;
+       char driver_version[20];
+       char pci_type[30];
+       char rth_steering_mask[30];
+       int intr_type;
+       unsigned long long rx_intr_cnt;
+       unsigned long long tx_intr_cnt;
+       unsigned long rx_msix_intr_cnt[8];
+       int tx_fifo_num;
+       unsigned long  fifo_len[8];
+       unsigned long long perm_addr;
+       int rx_ring_num;
+       int rxd_mode;
+       int rx_ring_size[8] ;
+       int rth_bucket_size;
+       int lro;
+       int lro_max_pkts;
+       int napi;
+       int rx_steering_type;
+       unsigned char rth_mask;
+       int vlan_tag_strip;
+       int device_type;
+       int mtu;
+       int latency_timer;
+       int rx_csum;
+       int tx_csum;
+       int ufo;
+       int tso;
+       int sg;
+       int pcix_cmd;
+       unsigned long long tx_urng;
+       unsigned long long rx_urng;
+       unsigned long long tx_ufc;
+       unsigned long long rx_ufc;
+};
+struct ioctlInfo {
+       unsigned long long value;
+       unsigned long long txbytes;
+       unsigned long long rxbytes;
+       int offset;
+       unsigned char *buffer;
+       unsigned char *buffer1;
+       unsigned char *buffer2;
+       unsigned char *buffer3;
+       unsigned char *buffer4;
+       unsigned char *buffer5;
+       unsigned char *buffer6;
+       int size;
+       struct generalInfo ginfo;
+};     
+/*
+ *$Log: util.h,v $
+ *Revision 1.5  2003/12/01 22:03:23  ukiran
+ *Bug:510
+ *Cleanup of \r chars
+ *
+ *Revision 1.4  2003/11/04 02:07:16  ukiran
+ *Bug:484
+ *Enabling Logs in source code
+ *
+ */
+