diff -Narup -X linux-2.6.18.orig/Documentation/dontdiff 
linux-2.6.18.orig/drivers/net/netxen/netxen_nic.h 
linux-2.6.18/drivers/net/netxen/netxen_nic.h
--- linux-2.6.18.orig/drivers/net/netxen/netxen_nic.h   1969-12-31 
16:00:00.000000000 -0800
+++ linux-2.6.18/drivers/net/netxen/netxen_nic.h        2006-09-25 
05:04:07.000000000 -0700
@@ -0,0 +1,910 @@
+/*
+ * Copyright (C) 2003 - 2006 NetXen, Inc.
+ * All rights reserved.
+ * + * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * + * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * + * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA  02111-1307, USA.
+ * + * The full GNU General Public License is included in this distribution
+ * in the file called LICENSE.
+ * + * Contact Information:
+ *    [EMAIL PROTECTED]
+ * NetXen,
+ * 3965 Freedom Circle, Fourth floor,
+ * Santa Clara, CA 95054
+ */
+
+#ifndef _NETXEN_NIC_H_
+#define _NETXEN_NIC_H_
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/compiler.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/ip.h>
+#include <linux/in.h>
+#include <linux/tcp.h>
+#include <linux/skbuff.h>
+#include <linux/version.h>
+
+#include <linux/ethtool.h>
+#include <linux/mii.h>
+#include <linux/interrupt.h>
+#include <linux/timer.h>
+
+#include <linux/mm.h>
+#include <linux/mman.h>
+
+#include <asm/system.h>
+#include <asm/io.h>
+#include <asm/byteorder.h>
+#include <asm/uaccess.h>
+#include <asm/pgtable.h>
+
+#include "netxen_nic_hw.h"
+
+#define NETXEN_NIC_BUILD_NO     "232"
+#define _NETXEN_NIC_LINUX_MAJOR 2
+#define _NETXEN_NIC_LINUX_MINOR 3
+#define _NETXEN_NIC_LINUX_SUBVERSION 57
+#define NETXEN_NIC_LINUX_VERSIONID  "2.3.57"
+#define NETXEN_NIC_FW_VERSIONID "2.3.57"
+
+#define RCV_DESC_RINGSIZE      \
+       (sizeof(struct rcv_desc) * adapter->max_rx_desc_count)
+#define STATUS_DESC_RINGSIZE   \
+       (sizeof(struct status_desc)* adapter->max_rx_desc_count)
+#define TX_RINGSIZE    \
+       (sizeof(struct netxen_cmd_buffer) * adapter->max_tx_desc_count)
+#define RCV_BUFFSIZE   \
+       (sizeof(struct netxen_rx_buffer) * rcv_desc->max_rx_desc_count)
+#define find_diff_among(a,b,range) ((a)<(b)?((b)-(a)):((b)+(range)-(a)))
+
+#define NETXEN_NETDEV_STATUS 0x1
+
+#define ADDR_IN_WINDOW1(off)   \
+       ((off > NETXEN_CRB_PCIX_HOST2) && (off < NETXEN_CRB_MAX)) ? 1 : 0
+
+/* + * normalize a 64MB crb address to 32MB PCI window + * To use NETXEN_CRB_NORMALIZE, window _must_ be set to 1
+ */
+#define NETXEN_CRB_NORMALIZE(adapter, reg) \
+       ((adapter)->ahw.pci_base + (reg)     \
+       - NETXEN_CRB_PCIX_HOST2 + NETXEN_CRB_PCIX_HOST)
+
+#define MAX_RX_BUFFER_LENGTH           2000
+#define MAX_RX_JUMBO_BUFFER_LENGTH     9046
+#define RX_DMA_MAP_LEN                 (MAX_RX_BUFFER_LENGTH - NET_IP_ALIGN)
+#define RX_JUMBO_DMA_MAP_LEN   \
+       (MAX_RX_JUMBO_BUFFER_LENGTH - NET_IP_ALIGN)
+#define NETXEN_ROM_ROUNDUP             0x80000000ULL
+
+/*
+ * Maximum number of ring contexts
+ */
+#define MAX_RING_CTX 1
+
+/* Opcodes to be used with the commands */
+enum {
+       TX_ETHER_PKT = 0x01,
+/* The following opcodes are for IP checksum   */
+       TX_TCP_PKT,
+       TX_UDP_PKT,
+       TX_IP_PKT,
+       TX_TCP_LSO,
+       TX_IPSEC,
+       TX_IPSEC_CMD
+};
+
+/* The following opcodes are for internal consumption. */
+#define NETXEN_CONTROL_OP      0x10
+#define PEGNET_REQUEST         0x11
+
+#define        MAX_NUM_CARDS           4
+
+#define MAX_BUFFERS_PER_CMD    32
+
+/*
+ * Following are the states of the Phantom. Phantom will set them and
+ * Host will read to check if the fields are correct.
+ */
+#define PHAN_INITIALIZE_START          0xff00
+#define PHAN_INITIALIZE_FAILED         0xffff
+#define PHAN_INITIALIZE_COMPLETE       0xff01
+
+/* Host writes the following to notify that it has done the init-handshake */
+#define PHAN_INITIALIZE_ACK    0xf00f
+
+#define NUM_RCV_DESC_RINGS     2       /* No of Rcv Descriptor contexts */
+
+/* descriptor types */
+#define RCV_DESC_NORMAL                0x01
+#define RCV_DESC_JUMBO         0x02
+#define RCV_DESC_NORMAL_CTXID  0
+#define RCV_DESC_JUMBO_CTXID   1
+
+#define RCV_DESC_TYPE(ID) \
+       ((ID == RCV_DESC_JUMBO_CTXID) ? RCV_DESC_JUMBO : RCV_DESC_NORMAL)
+
+#define MAX_CMD_DESCRIPTORS            1024
+#define MAX_RCV_DESCRIPTORS            32768
+#define MAX_JUMBO_RCV_DESCRIPTORS      1024
+#define MAX_RCVSTATUS_DESCRIPTORS      MAX_RCV_DESCRIPTORS
+#define MAX_JUMBO_RCV_DESC     MAX_JUMBO_RCV_DESCRIPTORS
+#define MAX_RCV_DESC           MAX_RCV_DESCRIPTORS
+#define MAX_RCVSTATUS_DESC     MAX_RCV_DESCRIPTORS
+#define NUM_RCV_DESC           (MAX_RCV_DESC + MAX_JUMBO_RCV_DESCRIPTORS)
+#define MAX_EPG_DESCRIPTORS    (MAX_CMD_DESCRIPTORS * 8)
+
+#define MIN_TX_COUNT   4096
+#define MIN_RX_COUNT   4096
+
+#define MAX_FRAME_SIZE 0x10000 /* 64K MAX size for LSO */
+
+#define PHAN_PEG_RCV_INITIALIZED       0xff01
+#define PHAN_PEG_RCV_START_INITIALIZE  0xff00
+
+#define get_next_index(index, length)  \
+       (((index) + 1) & ((length) - 1))
+
+#define get_index_range(index,length,count)    \
+       (((index) + (count)) & ((length) - 1))
+
+/*
+ * Following data structures describe the descriptors that will be used.
+ * Added fileds of tcpHdrSize and ipHdrSize, The driver needs to do it only 
when
+ * we are doing LSO (above the 1500 size packet) only.
+ */
+
+/*
+ * The size of reference handle been changed to 16 bits to pass the MSS fields
+ * for the LSO packet
+ */
+
+#define FLAGS_CHECKSUM_ENABLED 0x01
+#define FLAGS_LSO_ENABLED      0x02
+#define FLAGS_IPSEC_SA_ADD     0x04
+#define FLAGS_IPSEC_SA_DELETE  0x08
+#define FLAGS_VLAN_TAGGED      0x10
+
+#define CMD_DESC_TOTAL_LENGTH(cmd_desc)        \
+               ((cmd_desc)->length_tcp_hdr & 0x00FFFFFF)
+#define CMD_DESC_TCP_HDR_OFFSET(cmd_desc)      \
+               (((cmd_desc)->length_tcp_hdr >> 24) & 0x0FF)
+#define CMD_DESC_PORT(cmd_desc)                ((cmd_desc)->port_ctxid & 0x0F)
+#define CMD_DESC_CTX_ID(cmd_desc)      (((cmd_desc)->port_ctxid >> 4) & 0x0F)
+
+#define CMD_DESC_TOTAL_LENGTH_WRT(cmd_desc, var)       \
+               ((cmd_desc)->length_tcp_hdr |= ((var) & 0x00FFFFFF))
+#define CMD_DESC_TCP_HDR_OFFSET_WRT(cmd_desc, var)     \
+               ((cmd_desc)->length_tcp_hdr |= (((var) << 24) & 0xFF000000))
+#define CMD_DESC_PORT_WRT(cmd_desc, var)       \
+               ((cmd_desc)->port_ctxid |= ((var) & 0x0F))
+
+struct cmd_desc_type0 {
+       u64 netxen_next;        /* for fragments handled by Phantom */
+       union {
+               struct {
+                       u32 addr_low_part2;
+                       u32 addr_high_part2;
+               };
+               u64 addr_buffer2;
+       };
+
+       /* Bit pattern: 0-23 total length, 24-32 tcp header offset */
+       u32 length_tcp_hdr;
+       u8 ip_hdr_offset;       /* For LSO only */
+       u8 num_of_buffers;      /* total number of segments */
+       u8 flags;               /* as defined above */
+       u8 opcode;
+
+       u16 reference_handle;   /* changed to u16 to add mss */
+       u16 mss;                /* passed by NDIS_PACKET for LSO */
+       /* Bit pattern 0-3 port, 0-3 ctx id */
+       u8 port_ctxid;
+       u8 total_hdr_length;    /* LSO only : MAC+IP+TCP Hdr size */
+       u16 conn_id;            /* IPSec offoad only */
+
+       union {
+               struct {
+                       u32 addr_low_part3;
+                       u32 addr_high_part3;
+               };
+               u64 addr_buffer3;
+       };
+
+       union {
+               struct {
+                       u32 addr_low_part1;
+                       u32 addr_high_part1;
+               };
+               u64 addr_buffer1;
+       };
+
+       u16 buffer1_length;
+       u16 buffer2_length;
+       u16 buffer3_length;
+       u16 buffer4_length;
+
+       union {
+               struct {
+                       u32 addr_low_part4;
+                       u32 addr_high_part4;
+               };
+               u64 addr_buffer4;
+       };
+
+} __attribute__ ((aligned(64)));
+
+/* Note: sizeof(rcv_desc) should always be a mutliple of 2 */
+struct rcv_desc {
+       u16 reference_handle;
+       u16 reserved;
+       u32 buffer_length;      /* allocated buffer length (usually 2K) */
+       u64 addr_buffer;
+};
+
+/* opcode field in status_desc */
+#define RCV_NIC_PKT    (0xA)
+#define STATUS_NIC_PKT ((RCV_NIC_PKT) << 12)
+
+/* for status field in status_desc */
+#define STATUS_NEED_CKSUM      (1)
+#define STATUS_CKSUM_OK                (2)
+
+/* owner bits of status_desc */
+#define STATUS_OWNER_HOST      (0x1)
+#define STATUS_OWNER_PHANTOM   (0x2)
+
+#define NETXEN_PROT_IP         (1)
+#define NETXEN_PROT_UNKNOWN    (0)
+
+/* Note: sizeof(status_desc) should always be a mutliple of 2 */
+#define STATUS_DESC_PORT(status_desc)  \
+               ((status_desc)->port_status_type_op & 0x0F)
+#define STATUS_DESC_STATUS(status_desc)        \
+               (((status_desc)->port_status_type_op >> 4) & 0x0F)
+#define STATUS_DESC_TYPE(status_desc)  \
+               (((status_desc)->port_status_type_op >> 8) & 0x0F)
+#define STATUS_DESC_OPCODE(status_desc)        \
+               (((status_desc)->port_status_type_op >> 12) & 0x0F)
+
+struct status_desc {
+       /* Bit pattern: 0-3 port, 4-7 status, 8-11 type, 12-15 opcode */
+       u16 port_status_type_op;
+       u16 total_length;       /* NIC mode */
+       u16 reference_handle;   /* handle for the associated packet */
+       /* Bit pattern: 0-1 owner, 2-5 protocol */
+       u16 owner;              /* Owner of the descriptor */
+} __attribute__ ((aligned(8)));
+
+enum {
+       NETXEN_RCV_PEG_0 = 0,
+       NETXEN_RCV_PEG_1
+};
+/* The version of the main data structure */
+#define        NETXEN_BDINFO_VERSION 1
+
+/* Magic number to let user know flash is programmed */
+#define        NETXEN_BDINFO_MAGIC 0x12345678
+
+/* Max number of Gig ports on a Phantom board */
+#define NETXEN_MAX_PORTS 4
+
+typedef enum {
+       NETXEN_BRDTYPE_P1_BD = 0x0000,
+       NETXEN_BRDTYPE_P1_SB = 0x0001,
+       NETXEN_BRDTYPE_P1_SMAX = 0x0002,
+       NETXEN_BRDTYPE_P1_SOCK = 0x0003,
+
+       NETXEN_BRDTYPE_P2_SOCK_31 = 0x0008,
+       NETXEN_BRDTYPE_P2_SOCK_35 = 0x0009,
+       NETXEN_BRDTYPE_P2_SB35_4G = 0x000a,
+       NETXEN_BRDTYPE_P2_SB31_10G = 0x000b,
+       NETXEN_BRDTYPE_P2_SB31_2G = 0x000c,
+
+       NETXEN_BRDTYPE_P2_SB31_10G_IMEZ = 0x000d,
+       NETXEN_BRDTYPE_P2_SB31_10G_HMEZ = 0x000e,
+       NETXEN_BRDTYPE_P2_SB31_10G_CX4 = 0x000f
+} netxen_brdtype_t;
+
+typedef enum {
+       NETXEN_BRDMFG_INVENTEC = 1
+} netxen_brdmfg;
+
+typedef enum {
+       MEM_ORG_128Mbx4 = 0x0,  /* DDR1 only */
+       MEM_ORG_128Mbx8 = 0x1,  /* DDR1 only */
+       MEM_ORG_128Mbx16 = 0x2, /* DDR1 only */
+       MEM_ORG_256Mbx4 = 0x3,
+       MEM_ORG_256Mbx8 = 0x4,
+       MEM_ORG_256Mbx16 = 0x5,
+       MEM_ORG_512Mbx4 = 0x6,
+       MEM_ORG_512Mbx8 = 0x7,
+       MEM_ORG_512Mbx16 = 0x8,
+       MEM_ORG_1Gbx4 = 0x9,
+       MEM_ORG_1Gbx8 = 0xa,
+       MEM_ORG_1Gbx16 = 0xb,
+       MEM_ORG_2Gbx4 = 0xc,
+       MEM_ORG_2Gbx8 = 0xd,
+       MEM_ORG_2Gbx16 = 0xe,
+       MEM_ORG_128Mbx32 = 0x10002,     /* GDDR only */
+       MEM_ORG_256Mbx32 = 0x10005      /* GDDR only */
+} netxen_mn_mem_org_t;
+
+typedef enum {
+       MEM_ORG_512Kx36 = 0x0,
+       MEM_ORG_1Mx36 = 0x1,
+       MEM_ORG_2Mx36 = 0x2
+} netxen_sn_mem_org_t;
+
+typedef enum {
+       MEM_DEPTH_4MB = 0x1,
+       MEM_DEPTH_8MB = 0x2,
+       MEM_DEPTH_16MB = 0x3,
+       MEM_DEPTH_32MB = 0x4,
+       MEM_DEPTH_64MB = 0x5,
+       MEM_DEPTH_128MB = 0x6,
+       MEM_DEPTH_256MB = 0x7,
+       MEM_DEPTH_512MB = 0x8,
+       MEM_DEPTH_1GB = 0x9,
+       MEM_DEPTH_2GB = 0xa,
+       MEM_DEPTH_4GB = 0xb,
+       MEM_DEPTH_8GB = 0xc,
+       MEM_DEPTH_16GB = 0xd,
+       MEM_DEPTH_32GB = 0xe
+} netxen_mem_depth_t;
+
+struct netxen_board_info {
+       u32 header_version;
+
+       u32 board_mfg;
+       u32 board_type;
+       u32 board_num;
+       u32 chip_id;
+       u32 chip_minor;
+       u32 chip_major;
+       u32 chip_pkg;
+       u32 chip_lot;
+
+       u32 port_mask;          /* available niu ports */
+       u32 peg_mask;           /* available pegs */
+       u32 icache_ok;          /* can we run with icache? */
+       u32 dcache_ok;          /* can we run with dcache? */
+       u32 casper_ok;
+
+       u32 mac_addr_lo_0;
+       u32 mac_addr_lo_1;
+       u32 mac_addr_lo_2;
+       u32 mac_addr_lo_3;
+
+       /* MN-related config */
+       u32 mn_sync_mode;       /* enable/ sync shift cclk/ sync shift mclk */
+       u32 mn_sync_shift_cclk;
+       u32 mn_sync_shift_mclk;
+       u32 mn_wb_en;
+       u32 mn_crystal_freq;    /* in MHz */
+       u32 mn_speed;           /* in MHz */
+       u32 mn_org;
+       u32 mn_depth;
+       u32 mn_ranks_0;         /* ranks per slot */
+       u32 mn_ranks_1;         /* ranks per slot */
+       u32 mn_rd_latency_0;
+       u32 mn_rd_latency_1;
+       u32 mn_rd_latency_2;
+       u32 mn_rd_latency_3;
+       u32 mn_rd_latency_4;
+       u32 mn_rd_latency_5;
+       u32 mn_rd_latency_6;
+       u32 mn_rd_latency_7;
+       u32 mn_rd_latency_8;
+       u32 mn_dll_val[18];
+       u32 mn_mode_reg;        /* MIU DDR Mode Register */
+       u32 mn_ext_mode_reg;    /* MIU DDR Extended Mode Register */
+       u32 mn_timing_0;        /* MIU Memory Control Timing Rgister */
+       u32 mn_timing_1;        /* MIU Extended Memory Ctrl Timing Register */
+       u32 mn_timing_2;        /* MIU Extended Memory Ctrl Timing2 Register */
+
+       /* SN-related config */
+       u32 sn_sync_mode;       /* enable/ sync shift cclk / sync shift mclk */
+       u32 sn_pt_mode;         /* pass through mode */
+       u32 sn_ecc_en;
+       u32 sn_wb_en;
+       u32 sn_crystal_freq;
+       u32 sn_speed;
+       u32 sn_org;
+       u32 sn_depth;
+       u32 sn_dll_tap;
+       u32 sn_rd_latency;
+
+       u32 mac_addr_hi_0;
+       u32 mac_addr_hi_1;
+       u32 mac_addr_hi_2;
+       u32 mac_addr_hi_3;
+
+       u32 magic;              /* indicates flash has been initialized */
+
+       u32 mn_rdimm;
+       u32 mn_dll_override;
+
+};
+
+#define FLASH_NUM_PORTS                (4)
+
+struct netxen_flash_mac_addr {
+       u32 flash_addr[32];
+};
+
+struct netxen_user_old_info {
+       u8 flash_md5[16];
+       u8 crbinit_md5[16];
+       u8 brdcfg_md5[16];
+       /* bootloader */
+       u32 bootld_version;
+       u32 bootld_size;
+       u8 bootld_md5[16];
+       /* image */
+       u32 image_version;
+       u32 image_size;
+       u8 image_md5[16];
+       /* primary image status */
+       u32 primary_status;
+       u32 secondary_present;
+
+       /* MAC address , 4 ports */
+       struct netxen_flash_mac_addr mac_addr[FLASH_NUM_PORTS];
+};
+#define FLASH_NUM_MAC_PER_PORT 32
+struct netxen_user_info {
+       u8 flash_md5[16 * 64];
+       /* bootloader */
+       u32 bootld_version;
+       u32 bootld_size;
+       /* image */
+       u32 image_version;
+       u32 image_size;
+       /* primary image status */
+       u32 primary_status;
+       u32 secondary_present;
+
+       /* MAC address , 4 ports, 32 address per port */
+       u64 mac_addr[FLASH_NUM_PORTS * FLASH_NUM_MAC_PER_PORT];
+       u32 sub_sys_id;
+       u8 serial_num[32];
+
+       /* Any user defined data */
+};
+
+/*
+ * Flash Layout - new format.
+ */
+struct netxen_new_user_info {
+       u8 flash_md5[16 * 64];
+       /* bootloader */
+       u32 bootld_version;
+       u32 bootld_size;
+       /* image */
+       u32 image_version;
+       u32 image_size;
+       /* primary image status */
+       u32 primary_status;
+       u32 secondary_present;
+
+       /* MAC address , 4 ports, 32 address per port */
+       u64 mac_addr[FLASH_NUM_PORTS * FLASH_NUM_MAC_PER_PORT];
+       u32 sub_sys_id;
+       u8 serial_num[32];
+
+       /* Any user defined data */
+};
+
+#define SECONDARY_IMAGE_PRESENT 0xb3b4b5b6
+#define SECONDARY_IMAGE_ABSENT 0xffffffff
+#define PRIMARY_IMAGE_GOOD     0x5a5a5a5a
+#define PRIMARY_IMAGE_BAD      0xffffffff
+
+/* Flash memory map */
+typedef enum {
+       CRBINIT_START = 0,      /* Crbinit section */
+       BRDCFG_START = 0x4000,  /* board config */
+       INITCODE_START = 0x6000,        /* pegtune code */
+       BOOTLD_START = 0x10000, /* bootld */
+       IMAGE_START = 0x43000,  /* compressed image */
+       SECONDARY_START = 0x200000,     /* backup images */
+       PXE_START = 0x3E0000,   /* user defined region */
+       USER_START = 0x3E8000,  /* User defined region for new boards */
+       FIXED_START = 0x3F0000  /* backup of crbinit */
+} netxen_flash_map_t;
+
+#define USER_START_OLD PXE_START       /* for backward compatibility */
+
+#define FLASH_START            (CRBINIT_START)
+#define INIT_SECTOR            (0)
+#define PRIMARY_START          (BOOTLD_START)
+#define FLASH_CRBINIT_SIZE     (0x4000)
+#define FLASH_BRDCFG_SIZE      (sizeof(struct netxen_board_info))
+#define FLASH_USER_SIZE                (sizeof(netxen_user_info)/sizeof(u32))
+#define FLASH_SECONDARY_SIZE   (USER_START-SECONDARY_START)
+#define NUM_PRIMARY_SECTORS    (0x20)
+#define NUM_CONFIG_SECTORS     (1)
+#define PFX "netxen: "
+
+/* Note: Make sure to not call this before adapter->port is valid */
+#if !defined(NETXEN_DEBUG)
+#define DPRINTK(klevel, fmt, args...)  do { \
+       } while (0)
+#else
+#define DPRINTK(klevel, fmt, args...)  do { \
+       printk(KERN_##klevel PFX "%s: %s: " fmt, __FUNCTION__,\
+               (adapter != NULL && adapter->port != NULL && \
+               adapter->port[0] != NULL && \
+               adapter->port[0]->netdev != NULL) ? \
+               adapter->port[0]->netdev->name : NULL, \
+               ## args); } while(0)
+#endif
+
+/* Number of status descriptors to handle per interrupt */
+#define MAX_STATUS_HANDLE      (128)
+
+/*
+ * netxen_skb_frag{} is to contain mapping info for each SG list. This
+ * has to be freed when DMA is complete. This is part of netxen_tx_buffer{}.
+ */
+struct netxen_skb_frag {
+       u64 dma;
+       u32 length;
+};
+
+/*    Following defines are for the state of the buffers    */
+#define        NETXEN_BUFFER_FREE      0
+#define        NETXEN_BUFFER_BUSY      1
+
+/*
+ * There will be one netxen_buffer per skb packet.    These will be
+ * used to save the dma info for pci_unmap_page()
+ */
+struct netxen_cmd_buffer {
+       struct sk_buff *skb;
+       struct netxen_skb_frag frag_array[MAX_BUFFERS_PER_CMD + 1];
+       u32 total_length;
+       u32 mss;
+       u16 port;
+       u8 cmd;
+       u8 frag_count;
+       unsigned long time_stamp;
+       u32 state;
+       u32 no_of_descriptors;
+};
+
+/* In rx_buffer, we do not need multiple fragments as is a single buffer */
+struct netxen_rx_buffer {
+       struct sk_buff *skb;
+       u64 dma;
+       u16 ref_handle;
+       u16 state;
+};
+
+/* Board types */
+#define        NETXEN_NIC_GBE  0x01
+#define        NETXEN_NIC_XGBE 0x02
+
+/*
+ * One hardware_context{} per adapter
+ * contains interrupt info as well shared hardware info.
+ */
+struct netxen_hardware_context {
+       struct pci_dev *pdev;
+       void __iomem *pci_base; /* base of mapped phantom memory */
+       u8 revision_id;
+       u16 board_type;
+       u16 max_ports;
+       struct netxen_board_info boardcfg;
+       u32 xg_linkup;
+       /* Address of cmd ring in Phantom */
+       struct cmd_desc_type0 *cmd_desc_head;
+       dma_addr_t cmd_desc_phys_addr;
+       struct netxen_adapter *adapter;
+};
+
+#define MINIMUM_ETHERNET_FRAME_SIZE    64      /* With FCS */
+#define ETHERNET_FCS_SIZE              4
+
+struct netxen_adapter_stats {
+       u64 ints;
+       u64 hostints;
+       u64 otherints;
+       u64 process_rcv;
+       u64 process_xmit;
+       u64 noxmitdone;
+       u64 xmitcsummed;
+       u64 post_called;
+       u64 posted;
+       u64 lastposted;
+       u64 goodskbposts;
+};
+
+/*
+ * Rcv Descriptor Context. One such per Rcv Descriptor. There may
+ * be one Rcv Descriptor for normal packets, one for jumbo and may be others.
+ */
+struct netxen_rcv_desc_ctx {
+       u32 flags;
+       u32 producer;
+       u32 rcv_pending;        /* Num of bufs posted in phantom */
+       u32 rcv_free;           /* Num of bufs in free list */
+       dma_addr_t phys_addr;
+       struct rcv_desc *desc_head;     /* address of rx ring in Phantom */
+       u32 max_rx_desc_count;
+       u32 dma_size;
+       u32 skb_size;
+       struct netxen_rx_buffer *rx_buf_arr;    /* rx buffers for receive   */
+       int begin_alloc;
+};
+
+/*
+ * Receive context. There is one such structure per instance of the
+ * receive processing. Any state information that is relevant to
+ * the receive, and is must be in this structure. The global data may be
+ * present elsewhere.
+ */
+struct netxen_recv_context {
+       struct netxen_rcv_desc_ctx rcv_desc[NUM_RCV_DESC_RINGS];
+       u32 status_rx_producer;
+       u32 status_rx_consumer;
+       dma_addr_t rcv_status_desc_phys_addr;
+       struct status_desc *rcv_status_desc_head;
+};
+
+#define NETXEN_NIC_MSI_ENABLED 0x02
+
+struct netxen_drvops;
+
+struct netxen_adapter {
+       struct netxen_hardware_context ahw;
+       int port_count;         /* Number of configured ports  */
+       int active_ports;       /* Number of open ports */
+       struct netxen_port *port[NETXEN_MAX_PORTS];     /* ptr to each port  */
+       spinlock_t tx_lock;
+       spinlock_t lock;
+       struct work_struct watchdog_task;
+       struct work_struct tx_timeout_task;
+       struct timer_list watchdog_timer;
+
+       u32 curr_window;
+
+       u32 cmd_producer;
+       u32 cmd_consumer;
+
+       u32 last_cmd_consumer;
+       u32 max_tx_desc_count;
+       u32 max_rx_desc_count;
+       u32 max_jumbo_rx_desc_count;
+       /* Num of instances active on cmd buffer ring */
+       u32 proc_cmd_buf_counter;
+
+       u32 num_threads, total_threads; /*Use to keep track of xmit threads */
+
+       u32 flags;
+       u32 irq;
+       int driver_mismatch;
+
+       struct netxen_adapter_stats stats;
+
+       struct netxen_cmd_buffer *cmd_buf_arr;  /* Command buffers for xmit */
+
+       /*
+        * Receive instances. These can be either one per port,
+        * or one per peg, etc.
+        */
+       struct netxen_recv_context recv_ctx[MAX_RCV_CTX];
+
+       int is_up;
+       int work_done;
+       struct netxen_drvops *ops;
+};                             /* netxen_adapter structure */
+
+/* Max number of xmit producer threads that can run simultaneously */
+#define        MAX_XMIT_PRODUCERS              16
+
+struct netxen_port_stats {
+       u64 rcvdbadskb;
+       u64 xmitcalled;
+       u64 xmitedframes;
+       u64 xmitfinished;
+       u64 badskblen;
+       u64 nocmddescriptor;
+       u64 polled;
+       u64 uphappy;
+       u64 updropped;
+       u64 uplcong;
+       u64 uphcong;
+       u64 upmcong;
+       u64 updunno;
+       u64 skbfreed;
+       u64 txdropped;
+       u64 txnullskb;
+       u64 csummed;
+       u64 no_rcv;
+       u64 rxbytes;
+       u64 txbytes;
+};
+
+struct netxen_port {
+       struct netxen_adapter *adapter;
+
+       u16 portnum;            /* GBE port number */
+       u16 link_speed;
+       u16 link_duplex;
+       u16 link_autoneg;
+
+       int flags;
+
+       struct net_device *netdev;
+       struct pci_dev *pdev;
+       struct net_device_stats net_stats;
+       struct netxen_port_stats stats;
+};
+
+struct netxen_drvops {
+       int (*enable_phy_interrupts) (struct netxen_adapter *, int);
+       int (*disable_phy_interrupts) (struct netxen_adapter *, int);
+       void (*handle_phy_intr) (struct netxen_adapter *);
+       int (*macaddr_set) (struct netxen_port *, netxen_ethernet_macaddr_t);
+       int (*set_mtu) (struct netxen_port *, int);
+       int (*set_promisc) (struct netxen_adapter *, int,
+                           netxen_niu_prom_mode_t);
+       int (*unset_promisc) (struct netxen_adapter *, int,
+                             netxen_niu_prom_mode_t);
+       int (*phy_read) (struct netxen_adapter *, long phy, long reg, u32 *);
+       int (*phy_write) (struct netxen_adapter *, long phy, long reg, u32 val);
+       int (*init_port) (struct netxen_adapter *, int);
+       void (*init_niu) (struct netxen_adapter *);
+       int (*stop_port) (struct netxen_adapter *, int);
+};
+
+extern char netxen_nic_driver_name[];
+
+int netxen_niu_xgbe_enable_phy_interrupts(struct netxen_adapter *adapter,
+                                         int port);
+int netxen_niu_gbe_enable_phy_interrupts(struct netxen_adapter *adapter,
+                                        int port);
+int netxen_niu_xgbe_disable_phy_interrupts(struct netxen_adapter *adapter,
+                                          int port);
+int netxen_niu_gbe_disable_phy_interrupts(struct netxen_adapter *adapter,
+                                         int port);
+int netxen_niu_xgbe_clear_phy_interrupts(struct netxen_adapter *adapter,
+                                        int port);
+int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter,
+                                       int port);
+void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter);
+void netxen_nic_gbe_handle_phy_intr(struct netxen_adapter *adapter);
+void netxen_niu_gbe_set_mii_mode(struct netxen_adapter *adapter, int port,
+                                long enable);
+void netxen_niu_gbe_set_gmii_mode(struct netxen_adapter *adapter, int port,
+                                 long enable);
+int netxen_niu_gbe_phy_read(struct netxen_adapter *adapter, long phy, long reg,
+                           __le32 * readval);
+int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, long phy,
+                            long reg, __le32 val);
+
+/* Functions available from netxen_nic_hw.c */
+int netxen_niu_xginit(struct netxen_adapter *);
+int netxen_nic_set_mtu_xgb(struct netxen_port *port, int new_mtu);
+int netxen_nic_set_mtu_gb(struct netxen_port *port, int new_mtu);
+void netxen_nic_init_niu_gb(struct netxen_adapter *adapter);
+void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw);
+void netxen_nic_reg_write(struct netxen_adapter *adapter, u64 off, u32 val);
+int netxen_nic_reg_read(struct netxen_adapter *adapter, u64 off);
+void netxen_nic_write_w0(struct netxen_adapter *adapter, u32 index, u32 value);
+void netxen_nic_read_w0(struct netxen_adapter *adapter, u32 index, u32 * 
value);
+
+int netxen_nic_get_board_info(struct netxen_adapter *adapter);
+int netxen_nic_hw_read_wx(struct netxen_adapter *adapter, u64 off, void *data,
+                         int len);
+int netxen_nic_hw_write_wx(struct netxen_adapter *adapter, u64 off, void *data,
+                          int len);
+void netxen_crb_writelit_adapter(struct netxen_adapter *adapter,
+                                unsigned long off, int data);
+
+/* Functions from netxen_nic_init.c */
+void netxen_phantom_init(struct netxen_adapter *adapter);
+void netxen_load_firmware(struct netxen_adapter *adapter);
+int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose);
+int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr, int *valp);
+
+/* Functions from netxen_nic_isr.c */
+void netxen_nic_isr_other(struct netxen_adapter *adapter);
+void netxen_indicate_link_status(struct netxen_adapter *adapter, u32 port,
+                                u32 link);
+void netxen_handle_port_int(struct netxen_adapter *adapter, u32 port,
+                           u32 enable);
+void netxen_nic_stop_all_ports(struct netxen_adapter *adapter);
+void netxen_initialize_adapter_sw(struct netxen_adapter *adapter);
+void netxen_initialize_adapter_hw(struct netxen_adapter *adapter);
+void netxen_initialize_adapter_ops(struct netxen_adapter *adapter);
+int netxen_init_firmware(struct netxen_adapter *adapter);
+void netxen_free_hw_resources(struct netxen_adapter *adapter);
+void netxen_tso_check(struct netxen_adapter *adapter,
+                     struct cmd_desc_type0 *desc, struct sk_buff *skb);
+int netxen_nic_hw_resources(struct netxen_adapter *adapter);
+void netxen_nic_clear_stats(struct netxen_adapter *adapter);
+int
+netxen_nic_do_ioctl(struct netxen_adapter *adapter, void *u_data,
+                   struct netxen_port *port);
+int netxen_nic_rx_has_work(struct netxen_adapter *adapter);
+int netxen_nic_tx_has_work(struct netxen_adapter *adapter);
+void netxen_watchdog_task(unsigned long v);
+void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx,
+                           u32 ringid);
+void netxen_process_cmd_ring(unsigned long data);
+u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctx, int max);
+void netxen_nic_set_multi(struct net_device *netdev);
+int netxen_nic_change_mtu(struct net_device *netdev, int new_mtu);
+int netxen_nic_set_mac(struct net_device *netdev, void *p);
+struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev);
+
+static inline void netxen_nic_disable_int(struct netxen_adapter *adapter)
+{
+       /*
+        * ISR_INT_MASK: Can be read from window 0 or 1.
+        */
+       writel(0x7ff, (void __iomem *)(adapter->ahw.pci_base + ISR_INT_MASK));
+}
+
+static inline void netxen_nic_enable_int(struct netxen_adapter *adapter)
+{
+       u32 mask;
+
+       switch (adapter->ahw.board_type) {
+       case NETXEN_NIC_GBE:
+               mask = 0x77b;
+               break;
+       case NETXEN_NIC_XGBE:
+               mask = 0x77f;
+               break;
+       default:
+               mask = 0x7ff;
+               break;
+       }
+
+       writel(mask, (void __iomem *)(adapter->ahw.pci_base + ISR_INT_MASK));
+
+       if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
+               mask = 0xbff;
+               writel(mask, (void __iomem *)
+                      (adapter->ahw.pci_base + ISR_INT_TARGET_MASK));
+       }
+}
+
+int netxen_is_flash_supported(struct netxen_adapter *adapter);
+int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, u64 mac[]);
+
+extern void netxen_change_ringparam(struct netxen_adapter *adapter);
+extern int netxen_rom_fast_read(struct netxen_adapter *adapter, int addr,
+                               int *valp);
+
+extern struct ethtool_ops netxen_nic_ethtool_ops;
+
+#endif                         /* __NETXEN_NIC_H_ */

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to