---

yaml
---
r: 41507
b: refs/heads/master
c: 1494a81
h: refs/heads/master
i:
  41505: 4635342
  41503: 17f2ad4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acd70c2bfddb52aee27a4864c160bea7f0d117e1
+refs/heads/master: 1494a81410d8c53fa6c800be1e22b6b6f64180e6

trunk/drivers/net/netxen/netxen_nic.h

@@ -30,7 +30,6 @@
 #ifndef _NETXEN_NIC_H_
 #define _NETXEN_NIC_H_
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>

trunk/drivers/net/netxen/netxen_nic_hdr.h

@@ -32,7 +32,6 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/config.h>
 #include <linux/version.h>
 
 #include <asm/semaphore.h>

trunk/drivers/net/netxen/netxen_nic_hw.c

@@ -351,7 +351,7 @@ void netxen_tso_check(struct netxen_adapter *adapter,
 		    ((skb->nh.iph)->ihl * sizeof(u32)) +
 		    ((skb->h.th)->doff * sizeof(u32));
 		desc->opcode = TX_TCP_LSO;
-	} else if (skb->ip_summed == CHECKSUM_HW) {
+	} else if (skb->ip_summed == CHECKSUM_COMPLETE) {
 		if (skb->nh.iph->protocol == IPPROTO_TCP) {
 			desc->opcode = TX_TCP_PKT;
 		} else if (skb->nh.iph->protocol == IPPROTO_UDP) {

trunk/drivers/net/netxen/netxen_nic_main.c

@@ -38,6 +38,9 @@
 #include "netxen_nic_phan_reg.h"
 #include "netxen_nic_ioctl.h"
 
+#include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
+
 MODULE_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID);
@@ -66,7 +69,7 @@ static int netxen_nic_poll(struct net_device *dev, int *budget);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void netxen_nic_poll_controller(struct net_device *netdev);
 #endif
-static irqreturn_t netxen_intr(int irq, void *data, struct pt_regs *regs);
+static irqreturn_t netxen_intr(int irq, void *data);
 
 /*  PCI Device ID Table  */
 static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
@@ -969,7 +972,7 @@ netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
  * @irq: interrupt number
  * data points to adapter stucture (which may be handling more than 1 port
  */
-irqreturn_t netxen_intr(int irq, void *data, struct pt_regs * regs)
+irqreturn_t netxen_intr(int irq, void *data)
 {
 	struct netxen_adapter *adapter;
 	struct netxen_port *port;
@@ -1049,7 +1052,7 @@ static void netxen_nic_poll_controller(struct net_device *netdev)
 	struct netxen_port *port = netdev_priv(netdev);
 	struct netxen_adapter *adapter = port->adapter;
 	disable_irq(adapter->irq);
-	netxen_intr(adapter->irq, adapter, NULL);
+	netxen_intr(adapter->irq, adapter);
 	enable_irq(adapter->irq);
 }
 #endif