5 files changed, 34 insertions, 39 deletions

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index b4c4fc0c7218..6490acf05305 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -63,7 +63,7 @@
 
 #include "netxen_nic_hw.h"
 
-#define NETXEN_NIC_BUILD_NO     "1"
+#define NETXEN_NIC_BUILD_NO     "4"
 #define _NETXEN_NIC_LINUX_MAJOR 3
 #define _NETXEN_NIC_LINUX_MINOR 3
 #define _NETXEN_NIC_LINUX_SUBVERSION 2
@@ -137,7 +137,7 @@ extern struct workqueue_struct *netxen_workq;
 #define THIRD_PAGE_GROUP_SIZE  THIRD_PAGE_GROUP_END - THIRD_PAGE_GROUP_START
 
 #define MAX_RX_BUFFER_LENGTH            1760
-#define MAX_RX_JUMBO_BUFFER_LENGTH      9046
+#define MAX_RX_JUMBO_BUFFER_LENGTH      8062
 #define MAX_RX_LRO_BUFFER_LENGTH        ((48*1024)-512)
 #define RX_DMA_MAP_LEN                  (MAX_RX_BUFFER_LENGTH - 2)
 #define RX_JUMBO_DMA_MAP_LEN    \
@@ -199,9 +199,9 @@ enum {
                         (RCV_DESC_NORMAL)))
 
 #define MAX_CMD_DESCRIPTORS             1024
-#define MAX_RCV_DESCRIPTORS             32768
-#define MAX_JUMBO_RCV_DESCRIPTORS       4096
-#define MAX_LRO_RCV_DESCRIPTORS         2048
+#define MAX_RCV_DESCRIPTORS             16384
+#define MAX_JUMBO_RCV_DESCRIPTORS       1024
+#define MAX_LRO_RCV_DESCRIPTORS         64
 #define MAX_RCVSTATUS_DESCRIPTORS       MAX_RCV_DESCRIPTORS
 #define MAX_JUMBO_RCV_DESC      MAX_JUMBO_RCV_DESCRIPTORS
 #define MAX_RCV_DESC            MAX_RCV_DESCRIPTORS
@@ -852,8 +852,6 @@ struct netxen_adapter {
         spinlock_t tx_lock;
         spinlock_t lock;
         struct work_struct watchdog_task;
-        struct work_struct tx_timeout_task;
-        struct net_device *netdev;
         struct timer_list watchdog_timer;
 
         u32 curr_window;
@@ -887,7 +885,6 @@ struct netxen_adapter {
         struct netxen_recv_context recv_ctx[MAX_RCV_CTX];
 
         int is_up;
-        int number;
         struct netxen_dummy_dma dummy_dma;
 
         /* Context interface shared between card and host */
@@ -950,6 +947,7 @@ struct netxen_port {
         struct pci_dev *pdev;
         struct net_device_stats net_stats;
         struct netxen_port_stats stats;
+        struct work_struct tx_timeout_task;
 };
 
 #define PCI_OFFSET_FIRST_RANGE(adapter, off)    \
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 5dac50c87075..c0c31d1914a7 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -376,7 +376,7 @@ void netxen_tso_check(struct netxen_adapter *adapter,
                     ((skb->nh.iph)->ihl * sizeof(u32)) +
                     ((skb->h.th)->doff * sizeof(u32));
                 netxen_set_cmd_desc_opcode(desc, TX_TCP_LSO);
-        } else if (skb->ip_summed == CHECKSUM_COMPLETE) {
+        } else if (skb->ip_summed == CHECKSUM_PARTIAL) {
                 if (skb->nh.iph->protocol == IPPROTO_TCP) {
                         netxen_set_cmd_desc_opcode(desc, TX_TCP_PKT);
                 } else if (skb->nh.iph->protocol == IPPROTO_UDP) {
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index deacc61e199c..c3e41f368554 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -927,7 +927,7 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
                 }
                 netxen_process_rcv(adapter, ctxid, desc);
                 netxen_clear_sts_owner(desc);
-                netxen_set_sts_owner(desc, STATUS_OWNER_PHANTOM);
+                netxen_set_sts_owner(desc, cpu_to_le16(STATUS_OWNER_PHANTOM));
                 consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);
                 count++;
         }
@@ -1022,7 +1022,7 @@ int netxen_process_cmd_ring(unsigned long data)
                              && netif_carrier_ok(port->netdev))
                     && ((jiffies - port->netdev->trans_start) >
                         port->netdev->watchdog_timeo)) {
-                        SCHEDULE_WORK(&port->adapter->tx_timeout_task);
+                        SCHEDULE_WORK(&port->tx_timeout_task);
                 }
 
                 last_consumer = get_next_index(last_consumer,
@@ -1137,13 +1137,13 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
                  */
                 dma = pci_map_single(pdev, skb->data, rcv_desc->dma_size,
                                      PCI_DMA_FROMDEVICE);
-                pdesc->addr_buffer = dma;
+                pdesc->addr_buffer = cpu_to_le64(dma);
                 buffer->skb = skb;
                 buffer->state = NETXEN_BUFFER_BUSY;
                 buffer->dma = dma;
                 /* make a rcv descriptor  */
-                pdesc->reference_handle = buffer->ref_handle;
-                pdesc->buffer_length = rcv_desc->dma_size;
+                pdesc->reference_handle = cpu_to_le16(buffer->ref_handle);
+                pdesc->buffer_length = cpu_to_le32(rcv_desc->dma_size);
                 DPRINTK(INFO, "done writing descripter\n");
                 producer =
                     get_next_index(producer, rcv_desc->max_rx_desc_count);
@@ -1231,8 +1231,8 @@ void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter, uint32_t ctx,
                                              PCI_DMA_FROMDEVICE);
 
                 /* make a rcv descriptor  */
-                pdesc->reference_handle = le16_to_cpu(buffer->ref_handle);
-                pdesc->buffer_length = le16_to_cpu(rcv_desc->dma_size);
+                pdesc->reference_handle = cpu_to_le16(buffer->ref_handle);
+                pdesc->buffer_length = cpu_to_le16(rcv_desc->dma_size);
                 pdesc->addr_buffer = cpu_to_le64(buffer->dma);
                 DPRINTK(INFO, "done writing descripter\n");
                 producer =
diff --git a/drivers/net/netxen/netxen_nic_isr.c b/drivers/net/netxen/netxen_nic_isr.c
index 1b45f50fa6aa..06847d4252c3 100644
--- a/drivers/net/netxen/netxen_nic_isr.c
+++ b/drivers/net/netxen/netxen_nic_isr.c
@@ -157,7 +157,8 @@ void netxen_nic_isr_other(struct netxen_adapter *adapter)
         for (portno = 0; portno < NETXEN_NIU_MAX_GBE_PORTS; portno++) {
                 linkup = val & 1;
                 if (linkup != (qg_linksup & 1)) {
-                        printk(KERN_INFO "%s: PORT %d link %s\n",
+                        printk(KERN_INFO "%s: %s PORT %d link %s\n",
+                               adapter->port[portno]->netdev->name,
                                netxen_nic_driver_name, portno,
                                ((linkup == 0) ? "down" : "up"));
                         netxen_indicate_link_status(adapter, portno, linkup);
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 1658ca1fa230..8a5792fea774 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -52,8 +52,6 @@ char netxen_nic_driver_name[] = "netxen-nic";
 static char netxen_nic_driver_string[] = "NetXen Network Driver version "
     NETXEN_NIC_LINUX_VERSIONID;
 
-struct netxen_adapter *g_adapter = NULL;
-
 #define NETXEN_NETDEV_WEIGHT 120
 #define NETXEN_ADAPTER_UP_MAGIC 777
 #define NETXEN_NIC_PEG_TUNE 0
@@ -87,6 +85,8 @@ static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
         {PCI_DEVICE(0x4040, 0x0003)},
         {PCI_DEVICE(0x4040, 0x0004)},
         {PCI_DEVICE(0x4040, 0x0005)},
+        {PCI_DEVICE(0x4040, 0x0024)},
+        {PCI_DEVICE(0x4040, 0x0025)},
         {0,}
 };
 
@@ -126,7 +126,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct netxen_cmd_buffer *cmd_buf_arr = NULL;
         u64 mac_addr[FLASH_NUM_PORTS + 1];
         int valid_mac = 0;
-        static int netxen_cards_found = 0;
 
         printk(KERN_INFO "%s \n", netxen_nic_driver_string);
         /* In current scheme, we use only PCI function 0 */
@@ -217,9 +216,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_dbunmap;
         }
 
-        if (netxen_cards_found == 0) {
-                g_adapter = adapter;
-        }
         adapter->max_tx_desc_count = MAX_CMD_DESCRIPTORS;
         adapter->max_rx_desc_count = MAX_RCV_DESCRIPTORS;
         adapter->max_jumbo_rx_desc_count = MAX_JUMBO_RCV_DESCRIPTORS;
@@ -424,8 +420,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                                                              netdev->dev_addr);
                         }
                 }
-                adapter->netdev = netdev;
-                INIT_WORK(&adapter->tx_timeout_task, netxen_tx_timeout_task);
+                INIT_WORK(&port->tx_timeout_task, netxen_tx_timeout_task);
                 netif_carrier_off(netdev);
                 netif_stop_queue(netdev);
 
@@ -440,6 +435,11 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 adapter->port[i] = port;
         }
 
+        writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
+        netxen_pinit_from_rom(adapter, 0);
+        udelay(500);
+        netxen_load_firmware(adapter);
+        netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
         /*
          * delay a while to ensure that the Pegs are up & running.
          * Otherwise, we might see some flaky behaviour.
@@ -457,7 +457,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 break;
         }
 
-        adapter->number = netxen_cards_found;
         adapter->driver_mismatch = 0;
 
         return 0;
@@ -527,6 +526,8 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
 
         netxen_nic_stop_all_ports(adapter);
         /* leave the hw in the same state as reboot */
+        netxen_pinit_from_rom(adapter, 0);
+        writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
         netxen_load_firmware(adapter);
         netxen_free_adapter_offload(adapter);
 
@@ -817,8 +818,8 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
         /* Take skb->data itself */
         pbuf = &adapter->cmd_buf_arr[producer];
         if ((netdev->features & NETIF_F_TSO) && skb_shinfo(skb)->gso_size > 0) {
-                pbuf->mss = skb_shinfo(skb)->gso_size;
-                hwdesc->mss = skb_shinfo(skb)->gso_size;
+                pbuf->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
+                hwdesc->mss = cpu_to_le16(skb_shinfo(skb)->gso_size);
         } else {
                 pbuf->mss = 0;
                 hwdesc->mss = 0;
@@ -952,11 +953,6 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 static void netxen_watchdog(unsigned long v)
 {
         struct netxen_adapter *adapter = (struct netxen_adapter *)v;
-        if (adapter != g_adapter) {
-                printk("%s: ***BUG*** adapter[%p] != g_adapter[%p]\n",
-                       __FUNCTION__, adapter, g_adapter);
-                return;
-        }
 
         SCHEDULE_WORK(&adapter->watchdog_task);
 }
@@ -965,23 +961,23 @@ static void netxen_tx_timeout(struct net_device *netdev)
 {
         struct netxen_port *port = (struct netxen_port *)netdev_priv(netdev);
 
-        SCHEDULE_WORK(&port->adapter->tx_timeout_task);
+        SCHEDULE_WORK(&port->tx_timeout_task);
 }
 
 static void netxen_tx_timeout_task(struct work_struct *work)
 {
-        struct netxen_adapter *adapter =
-                container_of(work, struct netxen_adapter, tx_timeout_task);
-        struct net_device *netdev = adapter->netdev;
+        struct netxen_port *port =
+                container_of(work, struct netxen_port, tx_timeout_task);
+        struct net_device *netdev = port->netdev;
         unsigned long flags;
 
         printk(KERN_ERR "%s %s: transmit timeout, resetting.\n",
                netxen_nic_driver_name, netdev->name);
 
-        spin_lock_irqsave(&adapter->lock, flags);
+        spin_lock_irqsave(&port->adapter->lock, flags);
         netxen_nic_close(netdev);
         netxen_nic_open(netdev);
-        spin_unlock_irqrestore(&adapter->lock, flags);
+        spin_unlock_irqrestore(&port->adapter->lock, flags);
         netdev->trans_start = jiffies;
         netif_wake_queue(netdev);
 }