7 files changed, 207 insertions, 249 deletions

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 6dca3574e355..77220687b92a 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -53,8 +53,8 @@
 
 #define _NETXEN_NIC_LINUX_MAJOR 4
 #define _NETXEN_NIC_LINUX_MINOR 0
-#define _NETXEN_NIC_LINUX_SUBVERSION 74
-#define NETXEN_NIC_LINUX_VERSIONID  "4.0.74"
+#define _NETXEN_NIC_LINUX_SUBVERSION 75
+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.75"
 
 #define NETXEN_VERSION_CODE(a, b, c)    (((a) << 24) + ((b) << 16) + (c))
 #define _major(v)       (((v) >> 24) & 0xff)
@@ -174,8 +174,11 @@
 
 #define MAX_NUM_CARDS           4
 
-#define MAX_BUFFERS_PER_CMD     32
-#define TX_STOP_THRESH          ((MAX_SKB_FRAGS >> 2) + 4)
+#define NETXEN_MAX_FRAGS_PER_TX 14
+#define MAX_TSO_HEADER_DESC     2
+#define MGMT_CMD_DESC_RESV      4
+#define TX_STOP_THRESH          ((MAX_SKB_FRAGS >> 2) + MAX_TSO_HEADER_DESC \
+                                                        + MGMT_CMD_DESC_RESV)
 #define NX_MAX_TX_TIMEOUTS      2
 
 /*
@@ -555,7 +558,7 @@ struct netxen_recv_crb {
  */
 struct netxen_cmd_buffer {
         struct sk_buff *skb;
-        struct netxen_skb_frag frag_array[MAX_BUFFERS_PER_CMD + 1];
+        struct netxen_skb_frag frag_array[MAX_SKB_FRAGS + 1];
         u32 frag_count;
 };
 
@@ -736,7 +739,8 @@ struct netxen_recv_context {
 #define NX_CDRP_CMD_READ_PEXQ_PARAMETERS        0x0000001c
 #define NX_CDRP_CMD_GET_LIC_CAPABILITIES        0x0000001d
 #define NX_CDRP_CMD_READ_MAX_LRO_PER_BOARD      0x0000001e
-#define NX_CDRP_CMD_MAX                         0x0000001f
+#define NX_CDRP_CMD_CONFIG_GBE_PORT             0x0000001f
+#define NX_CDRP_CMD_MAX                         0x00000020
 
 #define NX_RCODE_SUCCESS                0
 #define NX_RCODE_NO_HOST_MEM            1
@@ -1051,6 +1055,7 @@ typedef struct {
 #define NX_FW_CAPABILITY_BDG                    (1 << 8)
 #define NX_FW_CAPABILITY_FVLANTX                (1 << 9)
 #define NX_FW_CAPABILITY_HW_LRO                 (1 << 10)
+#define NX_FW_CAPABILITY_GBE_LINK_CFG           (1 << 11)
 
 /* module types */
 #define LINKEVENT_MODULE_NOT_PRESENT                    1
@@ -1129,6 +1134,7 @@ typedef struct {
 #define NETXEN_NIC_MSI_ENABLED          0x02
 #define NETXEN_NIC_MSIX_ENABLED         0x04
 #define NETXEN_NIC_LRO_ENABLED          0x08
+#define NETXEN_NIC_LRO_DISABLED         0x00
 #define NETXEN_NIC_BRIDGE_ENABLED       0X10
 #define NETXEN_NIC_DIAG_ENABLED         0x20
 #define NETXEN_IS_MSI_FAMILY(adapter) \
@@ -1171,7 +1177,7 @@ struct netxen_adapter {
         u8 max_sds_rings;
         u8 driver_mismatch;
         u8 msix_supported;
-        u8 rx_csum;
+        u8 __pad;
         u8 pci_using_dac;
         u8 portnum;
         u8 physical_port;
@@ -1253,19 +1259,9 @@ struct netxen_adapter {
         const struct firmware *fw;
 };
 
-int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port);
-int netxen_niu_disable_xg_port(struct netxen_adapter *adapter);
-
 int nx_fw_cmd_query_phy(struct netxen_adapter *adapter, u32 reg, u32 *val);
 int nx_fw_cmd_set_phy(struct netxen_adapter *adapter, u32 reg, u32 val);
 
-/* Functions available from netxen_nic_hw.c */
-int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu);
-int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu);
-
-int netxen_p2_nic_set_mac_addr(struct netxen_adapter *adapter, u8 *addr);
-int netxen_p3_nic_set_mac_addr(struct netxen_adapter *adapter, u8 *addr);
-
 #define NXRD32(adapter, off) \
         (adapter->crb_read(adapter, off))
 #define NXWR32(adapter, off, val) \
@@ -1345,11 +1341,8 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ringid,
                 struct nx_host_rds_ring *rds_ring);
 int netxen_process_cmd_ring(struct netxen_adapter *adapter);
 int netxen_process_rcv_ring(struct nx_host_sds_ring *sds_ring, int max);
-void netxen_p2_nic_set_multi(struct net_device *netdev);
-void netxen_p3_nic_set_multi(struct net_device *netdev);
+
 void netxen_p3_free_mac_list(struct netxen_adapter *adapter);
-int netxen_p2_nic_set_promisc(struct netxen_adapter *adapter, u32 mode);
-int netxen_p3_nic_set_promisc(struct netxen_adapter *adapter, u32);
 int netxen_config_intr_coalesce(struct netxen_adapter *adapter);
 int netxen_config_rss(struct netxen_adapter *adapter, int enable);
 int netxen_config_ipaddr(struct netxen_adapter *adapter, u32 ip, int cmd);
@@ -1358,15 +1351,14 @@ void netxen_advert_link_change(struct netxen_adapter *adapter, int linkup);
 void netxen_pci_camqm_read_2M(struct netxen_adapter *, u64, u64 *);
 void netxen_pci_camqm_write_2M(struct netxen_adapter *, u64, u64);
 
+int nx_fw_cmd_set_gbe_port(struct netxen_adapter *adapter,
+                                u32 speed, u32 duplex, u32 autoneg);
 int nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, int mtu);
 int netxen_nic_change_mtu(struct net_device *netdev, int new_mtu);
 int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable);
 int netxen_config_bridged_mode(struct netxen_adapter *adapter, int enable);
 int netxen_send_lro_cleanup(struct netxen_adapter *adapter);
 
-int netxen_nic_set_mac(struct net_device *netdev, void *p);
-struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev);
-
 void netxen_nic_update_cmd_producer(struct netxen_adapter *adapter,
                 struct nx_host_tx_ring *tx_ring);
 
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c
index 12612127a087..f16966afa64e 100644
--- a/drivers/net/netxen/netxen_nic_ctx.c
+++ b/drivers/net/netxen/netxen_nic_ctx.c
@@ -112,6 +112,21 @@ nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, int mtu)
         return 0;
 }
 
+int
+nx_fw_cmd_set_gbe_port(struct netxen_adapter *adapter,
+                        u32 speed, u32 duplex, u32 autoneg)
+{
+
+        return netxen_issue_cmd(adapter,
+                                adapter->ahw.pci_func,
+                                NXHAL_VERSION,
+                                speed,
+                                duplex,
+                                autoneg,
+                                NX_CDRP_CMD_CONFIG_GBE_PORT);
+
+}
+
 static int
 nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter)
 {
@@ -255,19 +270,6 @@ out_free_rq:
 }
 
 static void
-nx_fw_cmd_reset_ctx(struct netxen_adapter *adapter)
-{
-
-        netxen_issue_cmd(adapter, adapter->ahw.pci_func, NXHAL_VERSION,
-                        adapter->ahw.pci_func, NX_DESTROY_CTX_RESET, 0,
-                        NX_CDRP_CMD_DESTROY_RX_CTX);
-
-        netxen_issue_cmd(adapter, adapter->ahw.pci_func, NXHAL_VERSION,
-                        adapter->ahw.pci_func, NX_DESTROY_CTX_RESET, 0,
-                        NX_CDRP_CMD_DESTROY_TX_CTX);
-}
-
-static void
 nx_fw_cmd_destroy_rx_ctx(struct netxen_adapter *adapter)
 {
         struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
@@ -698,8 +700,6 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
         if (!NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
                 if (test_and_set_bit(__NX_FW_ATTACHED, &adapter->state))
                         goto done;
-                if (reset_devices)
-                        nx_fw_cmd_reset_ctx(adapter);
                 err = nx_fw_cmd_create_rx_ctx(adapter);
                 if (err)
                         goto err_out_free;
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index b30de24f4a52..b34fb74d07e3 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -117,7 +117,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 
                 ecmd->port = PORT_TP;
 
-                ecmd->speed = adapter->link_speed;
+                ethtool_cmd_speed_set(ecmd, adapter->link_speed);
                 ecmd->duplex = adapter->link_duplex;
                 ecmd->autoneg = adapter->link_autoneg;
 
@@ -134,7 +134,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                 }
 
                 if (netif_running(dev) && adapter->has_link_events) {
-                        ecmd->speed = adapter->link_speed;
+                        ethtool_cmd_speed_set(ecmd, adapter->link_speed);
                         ecmd->autoneg = adapter->link_autoneg;
                         ecmd->duplex = adapter->link_duplex;
                         goto skip;
@@ -146,10 +146,10 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                         u16 pcifn = adapter->ahw.pci_func;
 
                         val = NXRD32(adapter, P3_LINK_SPEED_REG(pcifn));
-                        ecmd->speed = P3_LINK_SPEED_MHZ *
-                                        P3_LINK_SPEED_VAL(pcifn, val);
+                        ethtool_cmd_speed_set(ecmd, P3_LINK_SPEED_MHZ *
+                                              P3_LINK_SPEED_VAL(pcifn, val));
                 } else
-                        ecmd->speed = SPEED_10000;
+                        ethtool_cmd_speed_set(ecmd, SPEED_10000);
 
                 ecmd->duplex = DUPLEX_FULL;
                 ecmd->autoneg = AUTONEG_DISABLE;
@@ -214,7 +214,6 @@ skip:
                         check_sfp_module = netif_running(dev) &&
                                 adapter->has_link_events;
                 } else {
-                        ecmd->autoneg = AUTONEG_ENABLE;
                         ecmd->supported |= (SUPPORTED_TP |SUPPORTED_Autoneg);
                         ecmd->advertising |=
                                 (ADVERTISED_TP | ADVERTISED_Autoneg);
@@ -252,53 +251,25 @@ static int
 netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
         struct netxen_adapter *adapter = netdev_priv(dev);
-        __u32 status;
+        u32 speed = ethtool_cmd_speed(ecmd);
+        int ret;
 
-        /* read which mode */
-        if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
-                /* autonegotiation */
-                if (adapter->phy_write &&
-                    adapter->phy_write(adapter,
-                                       NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
-                                       ecmd->autoneg) != 0)
-                        return -EIO;
-                else
-                        adapter->link_autoneg = ecmd->autoneg;
+        if (adapter->ahw.port_type != NETXEN_NIC_GBE)
+                return -EOPNOTSUPP;
 
-                if (adapter->phy_read &&
-                    adapter->phy_read(adapter,
-                                      NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                      &status) != 0)
-                        return -EIO;
+        if (!(adapter->capabilities & NX_FW_CAPABILITY_GBE_LINK_CFG))
+                return -EOPNOTSUPP;
 
-                /* speed */
-                switch (ecmd->speed) {
-                case SPEED_10:
-                        netxen_set_phy_speed(status, 0);
-                        break;
-                case SPEED_100:
-                        netxen_set_phy_speed(status, 1);
-                        break;
-                case SPEED_1000:
-                        netxen_set_phy_speed(status, 2);
-                        break;
-                }
-                /* set duplex mode */
-                if (ecmd->duplex == DUPLEX_HALF)
-                        netxen_clear_phy_duplex(status);
-                if (ecmd->duplex == DUPLEX_FULL)
-                        netxen_set_phy_duplex(status);
-                if (adapter->phy_write &&
-                    adapter->phy_write(adapter,
-                                       NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
-                                       *((int *)&status)) != 0)
-                        return -EIO;
-                else {
-                        adapter->link_speed = ecmd->speed;
-                        adapter->link_duplex = ecmd->duplex;
-                }
-        } else
+        ret = nx_fw_cmd_set_gbe_port(adapter, speed, ecmd->duplex,
+                                     ecmd->autoneg);
+        if (ret == NX_RCODE_NOT_SUPPORTED)
                 return -EOPNOTSUPP;
+        else if (ret)
+                return -EIO;
+
+        adapter->link_speed = speed;
+        adapter->link_duplex = ecmd->duplex;
+        adapter->link_autoneg = ecmd->autoneg;
 
         if (!netif_running(dev))
                 return 0;
@@ -706,48 +677,6 @@ netxen_nic_get_ethtool_stats(struct net_device *dev,
         }
 }
 
-static u32 netxen_nic_get_tx_csum(struct net_device *dev)
-{
-        return dev->features & NETIF_F_IP_CSUM;
-}
-
-static u32 netxen_nic_get_rx_csum(struct net_device *dev)
-{
-        struct netxen_adapter *adapter = netdev_priv(dev);
-        return adapter->rx_csum;
-}
-
-static int netxen_nic_set_rx_csum(struct net_device *dev, u32 data)
-{
-        struct netxen_adapter *adapter = netdev_priv(dev);
-        adapter->rx_csum = !!data;
-        return 0;
-}
-
-static u32 netxen_nic_get_tso(struct net_device *dev)
-{
-        struct netxen_adapter *adapter = netdev_priv(dev);
-
-        if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
-                return (dev->features & (NETIF_F_TSO | NETIF_F_TSO6)) != 0;
-
-        return (dev->features & NETIF_F_TSO) != 0;
-}
-
-static int netxen_nic_set_tso(struct net_device *dev, u32 data)
-{
-        if (data) {
-                struct netxen_adapter *adapter = netdev_priv(dev);
-
-                dev->features |= NETIF_F_TSO;
-                if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
-                        dev->features |= NETIF_F_TSO6;
-        } else
-                dev->features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
-
-        return 0;
-}
-
 static void
 netxen_nic_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
@@ -882,35 +811,6 @@ static int netxen_get_intr_coalesce(struct net_device *netdev,
         return 0;
 }
 
-static int netxen_nic_set_flags(struct net_device *netdev, u32 data)
-{
-        struct netxen_adapter *adapter = netdev_priv(netdev);
-        int hw_lro;
-
-        if (data & ~ETH_FLAG_LRO)
-                return -EINVAL;
-
-        if (!(adapter->capabilities & NX_FW_CAPABILITY_HW_LRO))
-                return -EINVAL;
-
-        if (data & ETH_FLAG_LRO) {
-                hw_lro = NETXEN_NIC_LRO_ENABLED;
-                netdev->features |= NETIF_F_LRO;
-        } else {
-                hw_lro = 0;
-                netdev->features &= ~NETIF_F_LRO;
-        }
-
-        if (netxen_config_hw_lro(adapter, hw_lro))
-                return -EIO;
-
-        if ((hw_lro == 0) && netxen_send_lro_cleanup(adapter))
-                return -EIO;
-
-
-        return 0;
-}
-
 const struct ethtool_ops netxen_nic_ethtool_ops = {
         .get_settings = netxen_nic_get_settings,
         .set_settings = netxen_nic_set_settings,
@@ -924,21 +824,12 @@ const struct ethtool_ops netxen_nic_ethtool_ops = {
         .set_ringparam = netxen_nic_set_ringparam,
         .get_pauseparam = netxen_nic_get_pauseparam,
         .set_pauseparam = netxen_nic_set_pauseparam,
-        .get_tx_csum = netxen_nic_get_tx_csum,
-        .set_tx_csum = ethtool_op_set_tx_csum,
-        .set_sg = ethtool_op_set_sg,
-        .get_tso = netxen_nic_get_tso,
-        .set_tso = netxen_nic_set_tso,
         .get_wol = netxen_nic_get_wol,
         .set_wol = netxen_nic_set_wol,
         .self_test = netxen_nic_diag_test,
         .get_strings = netxen_nic_get_strings,
         .get_ethtool_stats = netxen_nic_get_ethtool_stats,
         .get_sset_count = netxen_get_sset_count,
-        .get_rx_csum = netxen_nic_get_rx_csum,
-        .set_rx_csum = netxen_nic_set_rx_csum,
         .get_coalesce = netxen_get_intr_coalesce,
         .set_coalesce = netxen_set_intr_coalesce,
-        .get_flags = ethtool_op_get_flags,
-        .set_flags = netxen_nic_set_flags,
 };
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index d8bd73d7e296..dc1967c1f312 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -780,7 +780,7 @@ enum {
 
 /*
  * capabilities register, can be used to selectively enable/disable features
- * for backward compability
+ * for backward compatibility
  */
 #define CRB_NIC_CAPABILITIES_HOST       NETXEN_NIC_REG(0x1a8)
 #define CRB_NIC_MSI_MODE_HOST           NETXEN_NIC_REG(0x270)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 29d7b93d0493..5cef718fe35f 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -319,6 +319,8 @@ static unsigned crb_hub_agt[64] =
 
 #define NETXEN_PCIE_SEM_TIMEOUT 10000
 
+static int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu);
+
 int
 netxen_pcie_sem_lock(struct netxen_adapter *adapter, int sem, u32 id_reg)
 {
@@ -345,7 +347,7 @@ netxen_pcie_sem_unlock(struct netxen_adapter *adapter, int sem)
         NXRD32(adapter, NETXEN_PCIE_REG(PCIE_SEM_UNLOCK(sem)));
 }
 
-int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port)
+static int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port)
 {
         if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
                 NXWR32(adapter, NETXEN_NIU_XGE_CONFIG_1+(0x10000*port), 0x1447);
@@ -356,7 +358,7 @@ int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port)
 }
 
 /* Disable an XG interface */
-int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)
+static int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)
 {
         __u32 mac_cfg;
         u32 port = adapter->physical_port;
@@ -383,7 +385,7 @@ int netxen_niu_disable_xg_port(struct netxen_adapter *adapter)
 #define MAC_LO(addr) \
         ((addr[5] << 16) | (addr[4] << 8) | (addr[3]))
 
-int netxen_p2_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)
+static int netxen_p2_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)
 {
         u32 mac_cfg;
         u32 cnt = 0;
@@ -434,7 +436,7 @@ int netxen_p2_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)
         return 0;
 }
 
-int netxen_p2_nic_set_mac_addr(struct netxen_adapter *adapter, u8 *addr)
+static int netxen_p2_nic_set_mac_addr(struct netxen_adapter *adapter, u8 *addr)
 {
         u32 mac_hi, mac_lo;
         u32 reg_hi, reg_lo;
@@ -531,7 +533,7 @@ netxen_nic_set_mcast_addr(struct netxen_adapter *adapter,
         return 0;
 }
 
-void netxen_p2_nic_set_multi(struct net_device *netdev)
+static void netxen_p2_nic_set_multi(struct net_device *netdev)
 {
         struct netxen_adapter *adapter = netdev_priv(netdev);
         struct netdev_hw_addr *ha;
@@ -598,8 +600,14 @@ netxen_send_cmd_descs(struct netxen_adapter *adapter,
 
         if (nr_desc >= netxen_tx_avail(tx_ring)) {
                 netif_tx_stop_queue(tx_ring->txq);
-                __netif_tx_unlock_bh(tx_ring->txq);
-                return -EBUSY;
+                smp_mb();
+                if (netxen_tx_avail(tx_ring) > nr_desc) {
+                        if (netxen_tx_avail(tx_ring) > TX_STOP_THRESH)
+                                netif_tx_wake_queue(tx_ring->txq);
+                } else {
+                        __netif_tx_unlock_bh(tx_ring->txq);
+                        return -EBUSY;
+                }
         }
 
         do {
@@ -647,7 +655,7 @@ nx_p3_sre_macaddr_change(struct netxen_adapter *adapter, u8 *addr, unsigned op)
 }
 
 static int nx_p3_nic_add_mac(struct netxen_adapter *adapter,
-                u8 *addr, struct list_head *del_list)
+                const u8 *addr, struct list_head *del_list)
 {
         struct list_head *head;
         nx_mac_list_t *cur;
@@ -674,11 +682,13 @@ static int nx_p3_nic_add_mac(struct netxen_adapter *adapter,
                                 cur->mac_addr, NETXEN_MAC_ADD);
 }
 
-void netxen_p3_nic_set_multi(struct net_device *netdev)
+static void netxen_p3_nic_set_multi(struct net_device *netdev)
 {
         struct netxen_adapter *adapter = netdev_priv(netdev);
         struct netdev_hw_addr *ha;
-        u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+        static const u8 bcast_addr[ETH_ALEN] = {
+                0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+        };
         u32 mode = VPORT_MISS_MODE_DROP;
         LIST_HEAD(del_list);
         struct list_head *head;
@@ -721,7 +731,7 @@ send_fw_cmd:
         }
 }
 
-int netxen_p3_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)
+static int netxen_p3_nic_set_promisc(struct netxen_adapter *adapter, u32 mode)
 {
         nx_nic_req_t req;
         u64 word;
@@ -754,7 +764,7 @@ void netxen_p3_free_mac_list(struct netxen_adapter *adapter)
         }
 }
 
-int netxen_p3_nic_set_mac_addr(struct netxen_adapter *adapter, u8 *addr)
+static int netxen_p3_nic_set_mac_addr(struct netxen_adapter *adapter, u8 *addr)
 {
         /* assuming caller has already copied new addr to netdev */
         netxen_p3_nic_set_multi(adapter->netdev);
@@ -799,9 +809,6 @@ int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable)
         u64 word;
         int rv = 0;
 
-        if ((adapter->flags & NETXEN_NIC_LRO_ENABLED) == enable)
-                return 0;
-
         memset(&req, 0, sizeof(nx_nic_req_t));
 
         req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
@@ -817,8 +824,6 @@ int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable)
                         "configure hw lro request\n");
         }
 
-        adapter->flags ^= NETXEN_NIC_LRO_ENABLED;
-
         return rv;
 }
 
@@ -861,9 +866,11 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable)
         u64 word;
         int i, rv;
 
-        u64 key[] = { 0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL,
-                        0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL,
-                        0x255b0ec26d5a56daULL };
+        static const u64 key[] = {
+                0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL,
+                0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL,
+                0x255b0ec26d5a56daULL
+        };
 
 
         memset(&req, 0, sizeof(nx_nic_req_t));
@@ -887,7 +894,7 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable)
                 ((u64)(enable & 0x1) << 8) |
                 ((0x7ULL) << 48);
         req.words[0] = cpu_to_le64(word);
-        for (i = 0; i < 5; i++)
+        for (i = 0; i < ARRAY_SIZE(key); i++)
                 req.words[i+1] = cpu_to_le64(key[i]);
 
 
@@ -1816,14 +1823,14 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)
         if (netxen_rom_fast_read(adapter, offset, &board_type))
                 return -EIO;
 
-        adapter->ahw.board_type = board_type;
-
         if (board_type == NETXEN_BRDTYPE_P3_4_GB_MM) {
                 u32 gpio = NXRD32(adapter, NETXEN_ROMUSB_GLB_PAD_GPIO_I);
                 if ((gpio & 0x8000) == 0)
                         board_type = NETXEN_BRDTYPE_P3_10G_TP;
         }
 
+        adapter->ahw.board_type = board_type;
+
         switch (board_type) {
         case NETXEN_BRDTYPE_P2_SB35_4G:
                 adapter->ahw.port_type = NETXEN_NIC_GBE;
@@ -1867,16 +1874,7 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)
 }
 
 /* NIU access sections */
-
-int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu)
-{
-        new_mtu += MTU_FUDGE_FACTOR;
-        NXWR32(adapter, NETXEN_NIU_GB_MAX_FRAME_SIZE(adapter->physical_port),
-                new_mtu);
-        return 0;
-}
-
-int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu)
+static int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu)
 {
         new_mtu += MTU_FUDGE_FACTOR;
         if (adapter->physical_port == 0)
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index b075a35b85d4..7f999671c7b2 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -214,13 +214,12 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
         tx_ring->num_desc = adapter->num_txd;
         tx_ring->txq = netdev_get_tx_queue(netdev, 0);
 
-        cmd_buf_arr = vmalloc(TX_BUFF_RINGSIZE(tx_ring));
+        cmd_buf_arr = vzalloc(TX_BUFF_RINGSIZE(tx_ring));
         if (cmd_buf_arr == NULL) {
                 dev_err(&pdev->dev, "%s: failed to allocate cmd buffer ring\n",
                        netdev->name);
                 goto err_out;
         }
-        memset(cmd_buf_arr, 0, TX_BUFF_RINGSIZE(tx_ring));
         tx_ring->cmd_buf_arr = cmd_buf_arr;
 
         recv_ctx = &adapter->recv_ctx;
@@ -279,8 +278,7 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
                         break;
 
                 }
-                rds_ring->rx_buf_arr = (struct netxen_rx_buffer *)
-                        vmalloc(RCV_BUFF_RINGSIZE(rds_ring));
+                rds_ring->rx_buf_arr = vzalloc(RCV_BUFF_RINGSIZE(rds_ring));
                 if (rds_ring->rx_buf_arr == NULL) {
                         printk(KERN_ERR "%s: Failed to allocate "
                                 "rx buffer ring %d\n",
@@ -288,7 +286,6 @@ int netxen_alloc_sw_resources(struct netxen_adapter *adapter)
                         /* free whatever was already allocated */
                         goto err_out;
                 }
-                memset(rds_ring->rx_buf_arr, 0, RCV_BUFF_RINGSIZE(rds_ring));
                 INIT_LIST_HEAD(&rds_ring->free_list);
                 /*
                  * Now go through all of them, set reference handles
@@ -346,7 +343,7 @@ static u32 netxen_decode_crb_addr(u32 addr)
         if (pci_base == NETXEN_ADDR_ERROR)
                 return pci_base;
         else
-                return (pci_base + offset);
+                return pci_base + offset;
 }
 
 #define NETXEN_MAX_ROM_WAIT_USEC        100
@@ -1486,7 +1483,8 @@ static struct sk_buff *netxen_process_rxbuf(struct netxen_adapter *adapter,
         if (!skb)
                 goto no_skb;
 
-        if (likely(adapter->rx_csum && cksum == STATUS_CKSUM_OK)) {
+        if (likely((adapter->netdev->features & NETIF_F_RXCSUM)
+            && cksum == STATUS_CKSUM_OK)) {
                 adapter->stats.csummed++;
                 skb->ip_summed = CHECKSUM_UNNECESSARY;
         } else
@@ -1763,14 +1761,10 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter)
 
                 smp_mb();
 
-                if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev)) {
-                        __netif_tx_lock(tx_ring->txq, smp_processor_id());
-                        if (netxen_tx_avail(tx_ring) > TX_STOP_THRESH) {
+                if (netif_queue_stopped(netdev) && netif_carrier_ok(netdev))
+                        if (netxen_tx_avail(tx_ring) > TX_STOP_THRESH)
                                 netif_wake_queue(netdev);
-                                adapter->tx_timeo_cnt = 0;
-                        }
-                        __netif_tx_unlock(tx_ring->txq);
-                }
+                adapter->tx_timeo_cnt = 0;
         }
         /*
          * If everything is freed up to consumer then check if the ring is full
@@ -1789,7 +1783,7 @@ int netxen_process_cmd_ring(struct netxen_adapter *adapter)
         done = (sw_consumer == hw_consumer);
         spin_unlock(&adapter->tx_clean_lock);
 
-        return (done);
+        return done;
 }
 
 void
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 73d314592230..c0788a31ff0f 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -38,12 +38,9 @@
 #include <linux/sysfs.h>
 #include <linux/aer.h>
 
-MODULE_DESCRIPTION("QLogic/NetXen (1/10) GbE Converged Ethernet Driver");
+MODULE_DESCRIPTION("QLogic/NetXen (1/10) GbE Intelligent Ethernet Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID);
-MODULE_FIRMWARE(NX_P2_MN_ROMIMAGE_NAME);
-MODULE_FIRMWARE(NX_P3_CT_ROMIMAGE_NAME);
-MODULE_FIRMWARE(NX_P3_MN_ROMIMAGE_NAME);
 MODULE_FIRMWARE(NX_UNIFIED_ROMIMAGE_NAME);
 
 char netxen_nic_driver_name[] = "netxen_nic";
@@ -95,6 +92,8 @@ static irqreturn_t netxen_msi_intr(int irq, void *data);
 static irqreturn_t netxen_msix_intr(int irq, void *data);
 
 static void netxen_config_indev_addr(struct net_device *dev, unsigned long);
+static struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev);
+static int netxen_nic_set_mac(struct net_device *netdev, void *p);
 
 /*  PCI Device ID Table  */
 #define ENTRY(device) \
@@ -125,11 +124,6 @@ netxen_nic_update_cmd_producer(struct netxen_adapter *adapter,
                 struct nx_host_tx_ring *tx_ring)
 {
         NXWRIO(adapter, tx_ring->crb_cmd_producer, tx_ring->producer);
-
-        if (netxen_tx_avail(tx_ring) <= TX_STOP_THRESH) {
-                netif_stop_queue(adapter->netdev);
-                smp_mb();
-        }
 }
 
 static uint32_t crb_cmd_consumer[4] = {
@@ -177,7 +171,7 @@ netxen_alloc_sds_rings(struct netxen_recv_context *recv_ctx, int count)
 
         recv_ctx->sds_rings = kzalloc(size, GFP_KERNEL);
 
-        return (recv_ctx->sds_rings == NULL);
+        return recv_ctx->sds_rings == NULL;
 }
 
 static void
@@ -460,7 +454,7 @@ netxen_read_mac_addr(struct netxen_adapter *adapter)
         return 0;
 }
 
-int netxen_nic_set_mac(struct net_device *netdev, void *p)
+static int netxen_nic_set_mac(struct net_device *netdev, void *p)
 {
         struct netxen_adapter *adapter = netdev_priv(netdev);
         struct sockaddr *addr = p;
@@ -491,6 +485,37 @@ static void netxen_set_multicast_list(struct net_device *dev)
         adapter->set_multi(dev);
 }
 
+static u32 netxen_fix_features(struct net_device *dev, u32 features)
+{
+        if (!(features & NETIF_F_RXCSUM)) {
+                netdev_info(dev, "disabling LRO as RXCSUM is off\n");
+
+                features &= ~NETIF_F_LRO;
+        }
+
+        return features;
+}
+
+static int netxen_set_features(struct net_device *dev, u32 features)
+{
+        struct netxen_adapter *adapter = netdev_priv(dev);
+        int hw_lro;
+
+        if (!((dev->features ^ features) & NETIF_F_LRO))
+                return 0;
+
+        hw_lro = (features & NETIF_F_LRO) ? NETXEN_NIC_LRO_ENABLED
+                 : NETXEN_NIC_LRO_DISABLED;
+
+        if (netxen_config_hw_lro(adapter, hw_lro))
+                return -EIO;
+
+        if (!(features & NETIF_F_LRO) && netxen_send_lro_cleanup(adapter))
+                return -EIO;
+
+        return 0;
+}
+
 static const struct net_device_ops netxen_netdev_ops = {
         .ndo_open          = netxen_nic_open,
         .ndo_stop          = netxen_nic_close,
@@ -501,6 +526,8 @@ static const struct net_device_ops netxen_netdev_ops = {
         .ndo_set_mac_address    = netxen_nic_set_mac,
         .ndo_change_mtu    = netxen_nic_change_mtu,
         .ndo_tx_timeout    = netxen_tx_timeout,
+        .ndo_fix_features = netxen_fix_features,
+        .ndo_set_features = netxen_set_features,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller = netxen_nic_poll_controller,
 #endif
@@ -768,8 +795,6 @@ netxen_check_options(struct netxen_adapter *adapter)
         if (adapter->fw_version >= NETXEN_VERSION_CODE(4, 0, 222))
                 adapter->capabilities = NXRD32(adapter, CRB_FW_CAPABILITIES_1);
 
-        adapter->flags &= ~NETXEN_NIC_LRO_ENABLED;
-
         if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
                 adapter->num_rxd = DEFAULT_RCV_DESCRIPTORS_10G;
                 adapter->num_jumbo_rxd = MAX_JUMBO_RCV_DESCRIPTORS_10G;
@@ -913,7 +938,7 @@ netxen_nic_request_irq(struct netxen_adapter *adapter)
         struct nx_host_sds_ring *sds_ring;
         int err, ring;
 
-        unsigned long flags = IRQF_SAMPLE_RANDOM;
+        unsigned long flags = 0;
         struct net_device *netdev = adapter->netdev;
         struct netxen_recv_context *recv_ctx = &adapter->recv_ctx;
 
@@ -996,7 +1021,7 @@ __netxen_nic_up(struct netxen_adapter *adapter, struct net_device *netdev)
         if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
                 netxen_config_intr_coalesce(adapter);
 
-        if (adapter->capabilities & NX_FW_CAPABILITY_HW_LRO)
+        if (netdev->features & NETIF_F_LRO)
                 netxen_config_hw_lro(adapter, NETXEN_NIC_LRO_ENABLED);
 
         netxen_napi_enable(adapter);
@@ -1040,6 +1065,9 @@ __netxen_nic_down(struct netxen_adapter *adapter, struct net_device *netdev)
         netif_carrier_off(netdev);
         netif_tx_disable(netdev);
 
+        if (adapter->capabilities & NX_FW_CAPABILITY_LINK_NOTIFICATION)
+                netxen_linkevent_request(adapter, 0);
+
         if (adapter->stop_port)
                 adapter->stop_port(adapter);
 
@@ -1201,7 +1229,6 @@ netxen_setup_netdev(struct netxen_adapter *adapter,
         int err = 0;
         struct pci_dev *pdev = adapter->pdev;
 
-        adapter->rx_csum = 1;
         adapter->mc_enabled = 0;
         if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
                 adapter->max_mc_count = 38;
@@ -1209,20 +1236,19 @@ netxen_setup_netdev(struct netxen_adapter *adapter,
                 adapter->max_mc_count = 16;
 
         netdev->netdev_ops         = &netxen_netdev_ops;
-        netdev->watchdog_timeo     = 2*HZ;
+        netdev->watchdog_timeo     = 5*HZ;
 
         netxen_nic_change_mtu(netdev, netdev->mtu);
 
         SET_ETHTOOL_OPS(netdev, &netxen_nic_ethtool_ops);
 
-        netdev->features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
-        netdev->features |= (NETIF_F_GRO);
-        netdev->vlan_features |= (NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO);
+        netdev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
+                              NETIF_F_RXCSUM;
 
-        if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
-                netdev->features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
-                netdev->vlan_features |= (NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
-        }
+        if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
+                netdev->hw_features |= NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
+
+        netdev->vlan_features |= netdev->hw_features;
 
         if (adapter->pci_using_dac) {
                 netdev->features |= NETIF_F_HIGHDMA;
@@ -1230,10 +1256,12 @@ netxen_setup_netdev(struct netxen_adapter *adapter,
         }
 
         if (adapter->capabilities & NX_FW_CAPABILITY_FVLANTX)
-                netdev->features |= (NETIF_F_HW_VLAN_TX);
+                netdev->hw_features |= NETIF_F_HW_VLAN_TX;
 
         if (adapter->capabilities & NX_FW_CAPABILITY_HW_LRO)
-                netdev->features |= NETIF_F_LRO;
+                netdev->hw_features |= NETIF_F_LRO;
+
+        netdev->features |= netdev->hw_features;
 
         netdev->irq = adapter->msix_entries[0].vector;
 
@@ -1243,7 +1271,6 @@ netxen_setup_netdev(struct netxen_adapter *adapter,
                 dev_warn(&pdev->dev, "failed to read mac addr\n");
 
         netif_carrier_off(netdev);
-        netif_stop_queue(netdev);
 
         err = register_netdev(netdev);
         if (err) {
@@ -1254,6 +1281,28 @@ netxen_setup_netdev(struct netxen_adapter *adapter,
         return 0;
 }
 
+#ifdef CONFIG_PCIEAER
+static void netxen_mask_aer_correctable(struct netxen_adapter *adapter)
+{
+        struct pci_dev *pdev = adapter->pdev;
+        struct pci_dev *root = pdev->bus->self;
+        u32 aer_pos;
+
+        if (adapter->ahw.board_type != NETXEN_BRDTYPE_P3_4_GB_MM &&
+                adapter->ahw.board_type != NETXEN_BRDTYPE_P3_10G_TP)
+                return;
+
+        if (root->pcie_type != PCI_EXP_TYPE_ROOT_PORT)
+                return;
+
+        aer_pos = pci_find_ext_capability(root, PCI_EXT_CAP_ID_ERR);
+        if (!aer_pos)
+                return;
+
+        pci_write_config_dword(root, aer_pos + PCI_ERR_COR_MASK, 0xffff);
+}
+#endif
+
 static int __devinit
 netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
@@ -1262,6 +1311,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         int i = 0, err;
         int pci_func_id = PCI_FUNC(pdev->devfn);
         uint8_t revision_id;
+        u32 val;
 
         if (pdev->revision >= NX_P3_A0 && pdev->revision <= NX_P3_B1) {
                 pr_warning("%s: chip revisions between 0x%x-0x%x "
@@ -1322,6 +1372,10 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_iounmap;
         }
 
+#ifdef CONFIG_PCIEAER
+        netxen_mask_aer_correctable(adapter);
+#endif
+
         /* Mezz cards have PCI function 0,2,3 enabled */
         switch (adapter->ahw.board_type) {
         case NETXEN_BRDTYPE_P2_SB31_10G_IMEZ:
@@ -1333,6 +1387,14 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 break;
         }
 
+        if (adapter->portnum == 0) {
+                val = NXRD32(adapter, NX_CRB_DEV_REF_COUNT);
+                if (val != 0xffffffff && val != 0) {
+                        NXWR32(adapter, NX_CRB_DEV_REF_COUNT, 0);
+                        adapter->need_fw_reset = 1;
+                }
+        }
+
         err = netxen_start_firmware(adapter);
         if (err)
                 goto err_out_decr_ref;
@@ -1815,6 +1877,8 @@ netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         struct cmd_desc_type0 *hwdesc, *first_desc;
         struct pci_dev *pdev;
         int i, k;
+        int delta = 0;
+        struct skb_frag_struct *frag;
 
         u32 producer;
         int frag_count, no_of_desc;
@@ -1822,12 +1886,31 @@ netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 
         frag_count = skb_shinfo(skb)->nr_frags + 1;
 
+        /* 14 frags supported for normal packet and
+         * 32 frags supported for TSO packet
+         */
+        if (!skb_is_gso(skb) && frag_count > NETXEN_MAX_FRAGS_PER_TX) {
+
+                for (i = 0; i < (frag_count - NETXEN_MAX_FRAGS_PER_TX); i++) {
+                        frag = &skb_shinfo(skb)->frags[i];
+                        delta += frag->size;
+                }
+
+                if (!__pskb_pull_tail(skb, delta))
+                        goto drop_packet;
+
+                frag_count = 1 + skb_shinfo(skb)->nr_frags;
+        }
         /* 4 fragments per cmd des */
         no_of_desc = (frag_count + 3) >> 2;
 
-        if (unlikely(no_of_desc + 2 > netxen_tx_avail(tx_ring))) {
+        if (unlikely(netxen_tx_avail(tx_ring) <= TX_STOP_THRESH)) {
                 netif_stop_queue(netdev);
-                return NETDEV_TX_BUSY;
+                smp_mb();
+                if (netxen_tx_avail(tx_ring) > TX_STOP_THRESH)
+                        netif_start_queue(netdev);
+                else
+                        return NETDEV_TX_BUSY;
         }
 
         producer = tx_ring->producer;
@@ -1882,11 +1965,11 @@ netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 
         netxen_tso_check(netdev, tx_ring, first_desc, skb);
 
-        netxen_nic_update_cmd_producer(adapter, tx_ring);
-
         adapter->stats.txbytes += skb->len;
         adapter->stats.xmitcalled++;
 
+        netxen_nic_update_cmd_producer(adapter, tx_ring);
+
         return NETDEV_TX_OK;
 
 drop_packet:
@@ -2027,7 +2110,7 @@ request_reset:
         clear_bit(__NX_RESETTING, &adapter->state);
 }
 
-struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
+static struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
 {
         struct netxen_adapter *adapter = netdev_priv(netdev);
         struct net_device_stats *stats = &netdev->stats;