Commit 222335b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  spidernet : fix memory leak in spider_net_stop
  e100: fix napi ifdefs removing needed code
  netxen patches
parents 7a186422 a55eb05a

drivers/net/e100.c

+1 −6
Original line number Diff line number Diff line
@@ -2718,14 +2718,12 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state) 
	struct net_device *netdev = pci_get_drvdata(pdev);

	struct nic *nic = netdev_priv(netdev);



#ifdef CONFIG_E100_NAPI

	if (netif_running(netdev))

		netif_poll_disable(nic->netdev);

#endif

	del_timer_sync(&nic->watchdog);

	netif_carrier_off(nic->netdev);



	netif_device_detach(netdev);



	pci_save_state(pdev);



	if ((nic->flags & wol_magic) | e100_asf(nic)) {
@@ -2761,16 +2759,13 @@ static int e100_resume(struct pci_dev *pdev) 
}

#endif /* CONFIG_PM */





static void e100_shutdown(struct pci_dev *pdev)

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct nic *nic = netdev_priv(netdev);



#ifdef CONFIG_E100_NAPI

	if (netif_running(netdev))

		netif_poll_disable(nic->netdev);

#endif

	del_timer_sync(&nic->watchdog);

	netif_carrier_off(nic->netdev);

drivers/net/netxen/netxen_nic.h

+65 −71
Original line number Diff line number Diff line
@@ -239,49 +239,39 @@ extern unsigned long long netxen_dma_mask; 


typedef u32 netxen_ctx_msg;



#define _netxen_set_bits(config_word, start, bits, val)	{\

	unsigned long long mask = (((1ULL << (bits)) - 1) << (start));	\

	unsigned long long value = (val);	\

	(config_word) &= ~mask;	\

	(config_word) |= (((value) << (start)) & mask); \

}



#define netxen_set_msg_peg_id(config_word, val)	\

	_netxen_set_bits(config_word, 0, 2, val)

	((config_word) &= ~3, (config_word) |= val & 3)

#define netxen_set_msg_privid(config_word)	\

	set_bit(2, (unsigned long*)&config_word)

	((config_word) |= 1 << 2)

#define netxen_set_msg_count(config_word, val)	\

	_netxen_set_bits(config_word, 3, 15, val)

	((config_word) &= ~(0x7fff<<3), (config_word) |= (val & 0x7fff) << 3)

#define netxen_set_msg_ctxid(config_word, val)	\

	_netxen_set_bits(config_word, 18, 10, val)

	((config_word) &= ~(0x3ff<<18), (config_word) |= (val & 0x3ff) << 18)

#define netxen_set_msg_opcode(config_word, val)	\

	_netxen_set_bits(config_word, 28, 4, val)

	((config_word) &= ~(0xf<<24), (config_word) |= (val & 0xf) << 24)



struct netxen_rcv_context {

	u32 rcv_ring_addr_lo;

	u32 rcv_ring_addr_hi;

	u32 rcv_ring_size;

	u32 rsrvd;

	__le64 rcv_ring_addr;

	__le32 rcv_ring_size;

	__le32 rsrvd;

};



struct netxen_ring_ctx {



	/* one command ring */

	u64 cmd_consumer_offset;

	u32 cmd_ring_addr_lo;

	u32 cmd_ring_addr_hi;

	u32 cmd_ring_size;

	u32 rsrvd;

	__le64 cmd_consumer_offset;

	__le64 cmd_ring_addr;

	__le32 cmd_ring_size;

	__le32 rsrvd;



	/* three receive rings */

	struct netxen_rcv_context rcv_ctx[3];



	/* one status ring */

	u32 sts_ring_addr_lo;

	u32 sts_ring_addr_hi;

	u32 sts_ring_size;

	__le64 sts_ring_addr;

	__le32 sts_ring_size;



	u32 ctx_id;

	__le32 ctx_id;

} __attribute__ ((aligned(64)));



/*
@@ -305,81 +295,85 @@ struct netxen_ring_ctx { 
	((cmd_desc)->port_ctxid |= ((var) & 0x0F))



#define netxen_set_cmd_desc_flags(cmd_desc, val)	\

	_netxen_set_bits((cmd_desc)->flags_opcode, 0, 7, val)

	((cmd_desc)->flags_opcode &= ~cpu_to_le16(0x7f), \

	(cmd_desc)->flags_opcode |= cpu_to_le16((val) & 0x7f))

#define netxen_set_cmd_desc_opcode(cmd_desc, val)	\

	_netxen_set_bits((cmd_desc)->flags_opcode, 7, 6, val)

	((cmd_desc)->flags_opcode &= ~cpu_to_le16(0x3f<<7), \

	(cmd_desc)->flags_opcode |= cpu_to_le16((val) & (0x3f<<7)))



#define netxen_set_cmd_desc_num_of_buff(cmd_desc, val)	\

	_netxen_set_bits((cmd_desc)->num_of_buffers_total_length, 0, 8, val);

	((cmd_desc)->num_of_buffers_total_length &= ~cpu_to_le32(0xff), \

	(cmd_desc)->num_of_buffers_total_length |= cpu_to_le32((val) & 0xff))

#define netxen_set_cmd_desc_totallength(cmd_desc, val)	\

	_netxen_set_bits((cmd_desc)->num_of_buffers_total_length, 8, 24, val);

	((cmd_desc)->num_of_buffers_total_length &= cpu_to_le32(0xff), \

	(cmd_desc)->num_of_buffers_total_length |= cpu_to_le32(val << 24))



#define netxen_get_cmd_desc_opcode(cmd_desc)	\

	(((cmd_desc)->flags_opcode >> 7) & 0x003F)

	((le16_to_cpu((cmd_desc)->flags_opcode) >> 7) & 0x003F)

#define netxen_get_cmd_desc_totallength(cmd_desc)	\

	(((cmd_desc)->num_of_buffers_total_length >> 8) & 0x0FFFFFF)

	(le32_to_cpu((cmd_desc)->num_of_buffers_total_length) >> 8)



struct cmd_desc_type0 {

	u8 tcp_hdr_offset;	/* For LSO only */

	u8 ip_hdr_offset;	/* For LSO only */

	/* Bit pattern: 0-6 flags, 7-12 opcode, 13-15 unused */

	u16 flags_opcode;

	__le16 flags_opcode;

	/* Bit pattern: 0-7 total number of segments,

	   8-31 Total size of the packet */

	u32 num_of_buffers_total_length;

	__le32 num_of_buffers_total_length;

	union {

		struct {

			u32 addr_low_part2;

			u32 addr_high_part2;

			__le32 addr_low_part2;

			__le32 addr_high_part2;

		};

		u64 addr_buffer2;

		__le64 addr_buffer2;

	};



	u16 reference_handle;	/* changed to u16 to add mss */

	u16 mss;		/* passed by NDIS_PACKET for LSO */

	__le16 reference_handle;	/* changed to u16 to add mss */

	__le16 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 */

	__le16 conn_id;		/* IPSec offoad only */



	union {

		struct {

			u32 addr_low_part3;

			u32 addr_high_part3;

			__le32 addr_low_part3;

			__le32 addr_high_part3;

		};

		u64 addr_buffer3;

		__le64 addr_buffer3;

	};

	union {

		struct {

			u32 addr_low_part1;

			u32 addr_high_part1;

			__le32 addr_low_part1;

			__le32 addr_high_part1;

		};

		u64 addr_buffer1;

		__le64 addr_buffer1;

	};



	u16 buffer1_length;

	u16 buffer2_length;

	u16 buffer3_length;

	u16 buffer4_length;

	__le16 buffer1_length;

	__le16 buffer2_length;

	__le16 buffer3_length;

	__le16 buffer4_length;



	union {

		struct {

			u32 addr_low_part4;

			u32 addr_high_part4;

			__le32 addr_low_part4;

			__le32 addr_high_part4;

		};

		u64 addr_buffer4;

		__le64 addr_buffer4;

	};



	u64 unused;

	__le64 unused;



} __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;

	__le16 reference_handle;

	__le16 reserved;

	__le32 buffer_length;	/* allocated buffer length (usually 2K) */

	__le64 addr_buffer;

};



/* opcode field in status_desc */
@@ -405,36 +399,36 @@ struct rcv_desc { 
	(((status_desc)->lro & 0x80) >> 7)



#define netxen_get_sts_port(status_desc)	\

	((status_desc)->status_desc_data & 0x0F)

	(le64_to_cpu((status_desc)->status_desc_data) & 0x0F)

#define netxen_get_sts_status(status_desc)	\

	(((status_desc)->status_desc_data >> 4) & 0x0F)

	((le64_to_cpu((status_desc)->status_desc_data) >> 4) & 0x0F)

#define netxen_get_sts_type(status_desc)	\

	(((status_desc)->status_desc_data >> 8) & 0x0F)

	((le64_to_cpu((status_desc)->status_desc_data) >> 8) & 0x0F)

#define netxen_get_sts_totallength(status_desc)	\

	(((status_desc)->status_desc_data >> 12) & 0xFFFF)

	((le64_to_cpu((status_desc)->status_desc_data) >> 12) & 0xFFFF)

#define netxen_get_sts_refhandle(status_desc)	\

	(((status_desc)->status_desc_data >> 28) & 0xFFFF)

	((le64_to_cpu((status_desc)->status_desc_data) >> 28) & 0xFFFF)

#define netxen_get_sts_prot(status_desc)	\

	(((status_desc)->status_desc_data >> 44) & 0x0F)

	((le64_to_cpu((status_desc)->status_desc_data) >> 44) & 0x0F)

#define netxen_get_sts_owner(status_desc)	\

	(((status_desc)->status_desc_data >> 56) & 0x03)

	((le64_to_cpu((status_desc)->status_desc_data) >> 56) & 0x03)

#define netxen_get_sts_opcode(status_desc)	\

	(((status_desc)->status_desc_data >> 58) & 0x03F)

	((le64_to_cpu((status_desc)->status_desc_data) >> 58) & 0x03F)



#define netxen_clear_sts_owner(status_desc)	\

	((status_desc)->status_desc_data &=	\

	~(((unsigned long long)3) << 56 ))

	~cpu_to_le64(((unsigned long long)3) << 56 ))

#define netxen_set_sts_owner(status_desc, val)	\

	((status_desc)->status_desc_data |=	\

	(((unsigned long long)((val) & 0x3)) << 56 ))

	cpu_to_le64(((unsigned long long)((val) & 0x3)) << 56 ))



struct status_desc {

	/* Bit pattern: 0-3 port, 4-7 status, 8-11 type, 12-27 total_length

	   28-43 reference_handle, 44-47 protocol, 48-52 unused

	   53-55 desc_cnt, 56-57 owner, 58-63 opcode

	 */

	u64 status_desc_data;

	u32 hash_value;

	__le64 status_desc_data;

	__le32 hash_value;

	u8 hash_type;

	u8 msg_type;

	u8 unused;
@@ -1005,9 +999,9 @@ void netxen_niu_gbe_set_mii_mode(struct netxen_adapter *adapter, int port, 
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);

			    __u32 * readval);

int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, long phy,

			     long reg, __le32 val);

			     long reg, __u32 val);



/* Functions available from netxen_nic_hw.c */

int netxen_nic_set_mtu_xgb(struct netxen_port *port, int new_mtu);

drivers/net/netxen/netxen_nic_ethtool.c

+11 −11
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
{

	struct netxen_port *port = netdev_priv(dev);

	struct netxen_adapter *adapter = port->adapter;

	__le32 status;

	__u32 status;



	/* read which mode */

	if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
@@ -226,7 +226,7 @@ netxen_nic_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) 
		if (adapter->phy_write

		    && adapter->phy_write(adapter, port->portnum,

					  NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,

					  (__le32) ecmd->autoneg) != 0)

					  ecmd->autoneg) != 0)

			return -EIO;

		else

			port->link_autoneg = ecmd->autoneg;
@@ -279,7 +279,7 @@ static int netxen_nic_get_regs_len(struct net_device *dev) 
}



struct netxen_niu_regs {

	__le32 reg[NETXEN_NIC_REGS_COUNT];

	__u32 reg[NETXEN_NIC_REGS_COUNT];

};



static struct netxen_niu_regs niu_registers[] = {
@@ -372,7 +372,7 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p) 
{

	struct netxen_port *port = netdev_priv(dev);

	struct netxen_adapter *adapter = port->adapter;

	__le32 mode, *regs_buff = p;

	__u32 mode, *regs_buff = p;

	void __iomem *addr;

	int i, window;
@@ -415,7 +415,7 @@ static u32 netxen_nic_get_link(struct net_device *dev) 
{

	struct netxen_port *port = netdev_priv(dev);

	struct netxen_adapter *adapter = port->adapter;

	__le32 status;

	__u32 status;



	/* read which mode */

	if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
@@ -482,13 +482,13 @@ netxen_nic_get_pauseparam(struct net_device *dev, 
{

	struct netxen_port *port = netdev_priv(dev);

	struct netxen_adapter *adapter = port->adapter;

	__le32 val;

	__u32 val;



	if (adapter->ahw.board_type == NETXEN_NIC_GBE) {

		/* get flow control settings */

		netxen_nic_read_w0(adapter,

				   NETXEN_NIU_GB_MAC_CONFIG_0(port->portnum),

				   (u32 *) & val);

				   &val);

		pause->rx_pause = netxen_gb_get_rx_flowctl(val);

		pause->tx_pause = netxen_gb_get_tx_flowctl(val);

		/* get autoneg settings */
@@ -502,7 +502,7 @@ netxen_nic_set_pauseparam(struct net_device *dev, 
{

	struct netxen_port *port = netdev_priv(dev);

	struct netxen_adapter *adapter = port->adapter;

	__le32 val;

	__u32 val;

	unsigned int autoneg;



	/* read mode */
@@ -522,13 +522,13 @@ netxen_nic_set_pauseparam(struct net_device *dev, 


		netxen_nic_write_w0(adapter,

				    NETXEN_NIU_GB_MAC_CONFIG_0(port->portnum),

				    *(u32 *) (&val));

				    *&val);

		/* set autoneg */

		autoneg = pause->autoneg;

		if (adapter->phy_write

		    && adapter->phy_write(adapter, port->portnum,

					  NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,

					  (__le32) autoneg) != 0)

					  autoneg) != 0)

			return -EIO;

		else {

			port->link_autoneg = pause->autoneg;
@@ -543,7 +543,7 @@ static int netxen_nic_reg_test(struct net_device *dev) 
	struct netxen_port *port = netdev_priv(dev);

	struct netxen_adapter *adapter = port->adapter;

	u32 data_read, data_written, save;

	__le32 mode;

	__u32 mode;



	/* 

	 * first test the "Read Only" registers by writing which mode

drivers/net/netxen/netxen_nic_hw.c

+18 −25
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void netxen_nic_set_multi(struct net_device *netdev) 
	struct netxen_port *port = netdev_priv(netdev);

	struct netxen_adapter *adapter = port->adapter;

	struct dev_mc_list *mc_ptr;

	__le32 netxen_mac_addr_cntl_data = 0;

	__u32 netxen_mac_addr_cntl_data = 0;



	mc_ptr = netdev->mc_list;

	if (netdev->flags & IFF_PROMISC) {
@@ -236,8 +236,9 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter) 
	}

	memset(addr, 0, sizeof(struct netxen_ring_ctx));

	adapter->ctx_desc = (struct netxen_ring_ctx *)addr;

	adapter->ctx_desc->cmd_consumer_offset = adapter->ctx_desc_phys_addr

	    + sizeof(struct netxen_ring_ctx);

	adapter->ctx_desc->cmd_consumer_offset =

	    cpu_to_le64(adapter->ctx_desc_phys_addr +

			sizeof(struct netxen_ring_ctx));

	adapter->cmd_consumer = (uint32_t *) (((char *)addr) +

					      sizeof(struct netxen_ring_ctx));
@@ -253,11 +254,10 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter) 
		return -ENOMEM;

	}



	adapter->ctx_desc->cmd_ring_addr_lo =

	    hw->cmd_desc_phys_addr & 0xffffffffUL;

	adapter->ctx_desc->cmd_ring_addr_hi =

	    ((u64) hw->cmd_desc_phys_addr >> 32);

	adapter->ctx_desc->cmd_ring_size = adapter->max_tx_desc_count;

	adapter->ctx_desc->cmd_ring_addr =

		cpu_to_le64(hw->cmd_desc_phys_addr);

	adapter->ctx_desc->cmd_ring_size =

		cpu_to_le32(adapter->max_tx_desc_count);



	hw->cmd_desc_head = (struct cmd_desc_type0 *)addr;
@@ -278,12 +278,10 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter) 
				return err;

			}

			rcv_desc->desc_head = (struct rcv_desc *)addr;

			adapter->ctx_desc->rcv_ctx[ring].rcv_ring_addr_lo =

			    rcv_desc->phys_addr & 0xffffffffUL;

			adapter->ctx_desc->rcv_ctx[ring].rcv_ring_addr_hi =

			    ((u64) rcv_desc->phys_addr >> 32);

			adapter->ctx_desc->rcv_ctx[ring].rcv_ring_addr =

			    cpu_to_le64(rcv_desc->phys_addr);

			adapter->ctx_desc->rcv_ctx[ring].rcv_ring_size =

			    rcv_desc->max_rx_desc_count;

			    cpu_to_le32(rcv_desc->max_rx_desc_count);

		}



		addr = netxen_alloc(adapter->ahw.pdev, STATUS_DESC_RINGSIZE,
@@ -297,11 +295,10 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter) 
			return err;

		}

		recv_ctx->rcv_status_desc_head = (struct status_desc *)addr;

		adapter->ctx_desc->sts_ring_addr_lo =

		    recv_ctx->rcv_status_desc_phys_addr & 0xffffffffUL;

		adapter->ctx_desc->sts_ring_addr_hi =

		    ((u64) recv_ctx->rcv_status_desc_phys_addr >> 32);

		adapter->ctx_desc->sts_ring_size = adapter->max_rx_desc_count;

		adapter->ctx_desc->sts_ring_addr =

		    cpu_to_le64(recv_ctx->rcv_status_desc_phys_addr);

		adapter->ctx_desc->sts_ring_size =

		    cpu_to_le32(adapter->max_rx_desc_count);



	}

	/* Window = 1 */
@@ -387,10 +384,6 @@ void netxen_tso_check(struct netxen_adapter *adapter, 
	}

	adapter->stats.xmitcsummed++;

	desc->tcp_hdr_offset = skb->h.raw - skb->data;

	netxen_set_cmd_desc_totallength(desc,

					cpu_to_le32

					(netxen_get_cmd_desc_totallength

					 (desc)));

	desc->ip_hdr_offset = skb->nh.raw - skb->data;

}
@@ -867,9 +860,9 @@ netxen_crb_writelit_adapter(struct netxen_adapter *adapter, unsigned long off, 
void netxen_nic_set_link_parameters(struct netxen_port *port)

{

	struct netxen_adapter *adapter = port->adapter;

	__le32 status;

	__le32 autoneg;

	__le32 mode;

	__u32 status;

	__u32 autoneg;

	__u32 mode;



	netxen_nic_read_w0(adapter, NETXEN_NIU_MODE, &mode);

	if (netxen_get_niu_enable_ge(mode)) {	/* Gb 10/100/1000 Mbps mode */

drivers/net/netxen/netxen_nic_hw.h

+37 −37
Original line number Diff line number Diff line
@@ -124,28 +124,28 @@ typedef enum { 
 */



#define netxen_gb_enable_tx(config_word)	\

	set_bit(0, (unsigned long*)(&config_word))

	((config_word) |= 1 << 0)

#define netxen_gb_enable_rx(config_word)	\

	set_bit(2, (unsigned long*)(&config_word))

	((config_word) |= 1 << 2)

#define netxen_gb_tx_flowctl(config_word)	\

	set_bit(4, (unsigned long*)(&config_word))

	((config_word) |= 1 << 4)

#define netxen_gb_rx_flowctl(config_word)	\

	set_bit(5, (unsigned long*)(&config_word))

	((config_word) |= 1 << 5)

#define netxen_gb_tx_reset_pb(config_word)	\

		set_bit(16, (unsigned long*)(&config_word))

	((config_word) |= 1 << 16)

#define netxen_gb_rx_reset_pb(config_word)	\

		set_bit(17, (unsigned long*)(&config_word))

	((config_word) |= 1 << 17)

#define netxen_gb_tx_reset_mac(config_word)	\

		set_bit(18, (unsigned long*)(&config_word))

	((config_word) |= 1 << 18)

#define netxen_gb_rx_reset_mac(config_word)	\

		set_bit(19, (unsigned long*)(&config_word))

	((config_word) |= 1 << 19)

#define netxen_gb_soft_reset(config_word)	\

		set_bit(31, (unsigned long*)(&config_word))

	((config_word) |= 1 << 31)



#define netxen_gb_unset_tx_flowctl(config_word)	\

		clear_bit(4, (unsigned long *)(&config_word))

	((config_word) &= ~(1 << 4))

#define netxen_gb_unset_rx_flowctl(config_word)	\

		clear_bit(5, (unsigned long*)(&config_word))

	((config_word) &= ~(1 << 5))



#define netxen_gb_get_tx_synced(config_word)	\

		_netxen_crb_get_bit((config_word), 1)
@@ -171,15 +171,15 @@ typedef enum { 
 */



#define netxen_gb_set_duplex(config_word)	\

		set_bit(0, (unsigned long*)&config_word)

		((config_word) |= 1 << 0)

#define netxen_gb_set_crc_enable(config_word)	\

		set_bit(1, (unsigned long*)&config_word)

		((config_word) |= 1 << 1)

#define netxen_gb_set_padshort(config_word)	\

		set_bit(2, (unsigned long*)&config_word)

		((config_word) |= 1 << 2)

#define netxen_gb_set_checklength(config_word)	\

		set_bit(4, (unsigned long*)&config_word)

		((config_word) |= 1 << 4)

#define netxen_gb_set_hugeframes(config_word)	\

		set_bit(5, (unsigned long*)&config_word)

		((config_word) |= 1 << 5)

#define netxen_gb_set_preamblelen(config_word, val)	\

		((config_word) |= ((val) << 12) & 0xF000)

#define netxen_gb_set_intfmode(config_word, val)		\
@@ -190,9 +190,9 @@ typedef enum { 
#define netxen_gb_set_mii_mgmt_clockselect(config_word, val)	\

		((config_word) |= ((val) & 0x07))

#define netxen_gb_mii_mgmt_reset(config_word)	\

		set_bit(31, (unsigned long*)&config_word)

		((config_word) |= 1 << 31)

#define netxen_gb_mii_mgmt_unset(config_word)	\

		clear_bit(31, (unsigned long*)&config_word)

		((config_word) &= ~(1 << 31))



/*

 * NIU GB MII Mgmt Command Register (applies to GB0, GB1, GB2, GB3)
@@ -201,7 +201,7 @@ typedef enum { 
 */



#define netxen_gb_mii_mgmt_set_read_cycle(config_word)	\

		set_bit(0, (unsigned long*)&config_word)

		((config_word) |= 1 << 0)

#define netxen_gb_mii_mgmt_reg_addr(config_word, val)	\

		((config_word) |= ((val) & 0x1F))

#define netxen_gb_mii_mgmt_phy_addr(config_word, val)	\
@@ -274,9 +274,9 @@ typedef enum { 
#define netxen_set_phy_speed(config_word, val)	\

		((config_word) |= ((val & 0x03) << 14))

#define netxen_set_phy_duplex(config_word)	\

		set_bit(13, (unsigned long*)&config_word)

		((config_word) |= 1 << 13)

#define netxen_clear_phy_duplex(config_word)	\

		clear_bit(13, (unsigned long*)&config_word)

		((config_word) &= ~(1 << 13))



#define netxen_get_phy_jabber(config_word)	\

		_netxen_crb_get_bit(config_word, 0)
@@ -350,11 +350,11 @@ typedef enum { 
		_netxen_crb_get_bit(config_word, 15)



#define netxen_set_phy_int_link_status_changed(config_word)	\

		set_bit(10, (unsigned long*)&config_word)

		((config_word) |= 1 << 10)

#define netxen_set_phy_int_autoneg_completed(config_word)	\

		set_bit(11, (unsigned long*)&config_word)

		((config_word) |= 1 << 11)

#define netxen_set_phy_int_speed_changed(config_word)	\

		set_bit(14, (unsigned long*)&config_word)

		((config_word) |= 1 << 14)



/*

 * NIU Mode Register.
@@ -382,22 +382,22 @@ typedef enum { 
 */



#define netxen_set_gb_drop_gb0(config_word)	\

		set_bit(0, (unsigned long*)&config_word)

		((config_word) |= 1 << 0)

#define netxen_set_gb_drop_gb1(config_word)	\

		set_bit(1, (unsigned long*)&config_word)

		((config_word) |= 1 << 1)

#define netxen_set_gb_drop_gb2(config_word)	\

		set_bit(2, (unsigned long*)&config_word)

		((config_word) |= 1 << 2)

#define netxen_set_gb_drop_gb3(config_word)	\

		set_bit(3, (unsigned long*)&config_word)

		((config_word) |= 1 << 3)



#define netxen_clear_gb_drop_gb0(config_word)	\

		clear_bit(0, (unsigned long*)&config_word)

		((config_word) &= ~(1 << 0))

#define netxen_clear_gb_drop_gb1(config_word)	\

		clear_bit(1, (unsigned long*)&config_word)

		((config_word) &= ~(1 << 1))

#define netxen_clear_gb_drop_gb2(config_word)	\

		clear_bit(2, (unsigned long*)&config_word)

		((config_word) &= ~(1 << 2))

#define netxen_clear_gb_drop_gb3(config_word)	\

		clear_bit(3, (unsigned long*)&config_word)

		((config_word) &= ~(1 << 3))



/*

 * NIU XG MAC Config Register
@@ -413,7 +413,7 @@ typedef enum { 
 */



#define netxen_xg_soft_reset(config_word)	\

		set_bit(4, (unsigned long*)&config_word)

		((config_word) |= 1 << 4)



/*

 * MAC Control Register
@@ -433,19 +433,19 @@ typedef enum { 
#define netxen_nic_mcr_set_id_pool0(config, val)	\

		((config) |= ((val) &0x03))

#define netxen_nic_mcr_set_enable_xtnd0(config)	\

		(set_bit(3, (unsigned long *)&(config)))

		((config) |= 1 << 3)

#define netxen_nic_mcr_set_id_pool1(config, val)	\

		((config) |= (((val) & 0x03) << 4))

#define netxen_nic_mcr_set_enable_xtnd1(config)	\

		(set_bit(6, (unsigned long *)&(config)))

		((config) |= 1 << 6)

#define netxen_nic_mcr_set_id_pool2(config, val)	\

		((config) |= (((val) & 0x03) << 8))

#define netxen_nic_mcr_set_enable_xtnd2(config)	\

		(set_bit(10, (unsigned long *)&(config)))

		((config) |= 1 << 10)

#define netxen_nic_mcr_set_id_pool3(config, val)	\

		((config) |= (((val) & 0x03) << 12))

#define netxen_nic_mcr_set_enable_xtnd3(config)	\

		(set_bit(14, (unsigned long *)&(config)))

		((config) |= 1 << 14)

#define netxen_nic_mcr_set_mode_select(config, val)	\

		((config) |= (((val) & 0x03) << 24))

#define netxen_nic_mcr_set_enable_pool(config, val)	\