mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

[netdrvr] netxen: build fixes

Browse source 
Most contributed and Signed-off-by: Andrew Morton <akpm@osdl.org>
with some from me as well.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Jeff Garzik 2006-11-07 05:12:16 -05:00
parent acd70c2bfd
commit 1494a81410
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/netxen/netxen_nic.h
View file

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

1
drivers/net/netxen/netxen_nic_hdr.h
View file

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

2
drivers/net/netxen/netxen_nic_hw.c
View file

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

9
drivers/net/netxen/netxen_nic_main.c
View file

@ -38,6 +38,9 @@
#include "netxen_nic_phan_reg.h" #include "netxen_nic_phan_reg.h"
#include "netxen_nic_ioctl.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_DESCRIPTION("NetXen Multi port (1/10) Gigabit Network Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(NETXEN_NIC_LINUX_VERSIONID); 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 #ifdef CONFIG_NET_POLL_CONTROLLER
static void netxen_nic_poll_controller(struct net_device *netdev); static void netxen_nic_poll_controller(struct net_device *netdev);
#endif #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 */ /* PCI Device ID Table */
static struct pci_device_id netxen_pci_tbl[] __devinitdata = { 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 * @irq: interrupt number
* data points to adapter stucture (which may be handling more than 1 port * 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_adapter *adapter;
struct netxen_port *port; 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_port *port = netdev_priv(netdev);
struct netxen_adapter *adapter = port->adapter; struct netxen_adapter *adapter = port->adapter;
disable_irq(adapter->irq); disable_irq(adapter->irq);
netxen_intr(adapter->irq, adapter, NULL); netxen_intr(adapter->irq, adapter);
enable_irq(adapter->irq); enable_irq(adapter->irq);
} }
#endif #endif