NetXen: Use multiple PCI functions (3176ff3e) · Commits · jan.koester / Linux

drivers/net/netxen/netxen_nic.h

+53 −72

Original line number	Original line	Diff line number	Diff line
	@@ -230,7 +230,9 @@ enum {
	(((index) + (count)) & ((length) - 1))		(((index) + (count)) & ((length) - 1))

	#define MPORT_SINGLE_FUNCTION_MODE 0x1111		#define MPORT_SINGLE_FUNCTION_MODE 0x1111
			#define MPORT_MULTI_FUNCTION_MODE 0x2222

			#include "netxen_nic_phan_reg.h"
	extern unsigned long long netxen_dma_mask;		extern unsigned long long netxen_dma_mask;
	extern unsigned long last_schedule_time;		extern unsigned long last_schedule_time;

	@@ -703,10 +705,8 @@ extern char netxen_nic_driver_name[];
	#else		#else
	#define DPRINTK(klevel, fmt, args...) do { \		#define DPRINTK(klevel, fmt, args...) do { \
	printk(KERN_##klevel PFX "%s: %s: " fmt, __FUNCTION__,\		printk(KERN_##klevel PFX "%s: %s: " fmt, __FUNCTION__,\
	(adapter != NULL && \		(adapter != NULL && adapter->netdev != NULL) ? \
	adapter->port[0] != NULL && \		adapter->netdev->name : NULL, \
	adapter->port[0]->netdev != NULL) ? \
	adapter->port[0]->netdev->name : NULL, \
	## args); } while(0)		## args); } while(0)
	#endif		#endif

	@@ -788,17 +788,27 @@ struct netxen_hardware_context {
	#define ETHERNET_FCS_SIZE 4		#define ETHERNET_FCS_SIZE 4

	struct netxen_adapter_stats {		struct netxen_adapter_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;
	u64 ints;		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;
	};		};

	/*		/*
	@@ -846,13 +856,19 @@ struct netxen_dummy_dma {

	struct netxen_adapter {		struct netxen_adapter {
	struct netxen_hardware_context ahw;		struct netxen_hardware_context ahw;
	int port_count; /* Number of configured ports */
	int active_ports; /* Number of open ports */		struct netxen_adapter *master;
	struct netxen_port port[NETXEN_MAX_PORTS]; / ptr to each port */		struct net_device *netdev;
			struct pci_dev *pdev;
			unsigned char mac_addr[ETH_ALEN];
			int mtu;
			int portnum;

	spinlock_t tx_lock;		spinlock_t tx_lock;
	spinlock_t lock;		spinlock_t lock;
	struct work_struct watchdog_task;		struct work_struct watchdog_task;
	struct timer_list watchdog_timer;		struct timer_list watchdog_timer;
			struct work_struct tx_timeout_task;

	u32 curr_window;		u32 curr_window;

	@@ -876,6 +892,15 @@ struct netxen_adapter {

	struct netxen_adapter_stats stats;		struct netxen_adapter_stats stats;

			u16 portno;
			u16 link_speed;
			u16 link_duplex;
			u16 state;
			u16 link_autoneg;
			int rcsum;
			int status;
			spinlock_t stats_lock;

	struct netxen_cmd_buffer cmd_buf_arr; / Command buffers for xmit */		struct netxen_cmd_buffer cmd_buf_arr; / Command buffers for xmit */

	/*		/*
	@@ -894,62 +919,20 @@ struct netxen_adapter {
	int (enable_phy_interrupts) (struct netxen_adapter , int);		int (enable_phy_interrupts) (struct netxen_adapter , int);
	int (disable_phy_interrupts) (struct netxen_adapter , int);		int (disable_phy_interrupts) (struct netxen_adapter , int);
	void (handle_phy_intr) (struct netxen_adapter );		void (handle_phy_intr) (struct netxen_adapter );
	int (macaddr_set) (struct netxen_port , netxen_ethernet_macaddr_t);		int (macaddr_set) (struct netxen_adapter , netxen_ethernet_macaddr_t);
	int (set_mtu) (struct netxen_port , int);		int (set_mtu) (struct netxen_adapter , int);
	int (set_promisc) (struct netxen_adapter , int,		int (set_promisc) (struct netxen_adapter , netxen_niu_prom_mode_t);
	netxen_niu_prom_mode_t);		int (unset_promisc) (struct netxen_adapter , 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_read) (struct netxen_adapter , long phy, long reg, u32 *);
	int (phy_write) (struct netxen_adapter , long phy, long reg, u32 val);		int (phy_write) (struct netxen_adapter , long phy, long reg, u32 val);
	int (init_port) (struct netxen_adapter , int);		int (init_port) (struct netxen_adapter , int);
	void (init_niu) (struct netxen_adapter );		void (init_niu) (struct netxen_adapter );
	int (stop_port) (struct netxen_adapter , int);		int (stop_port) (struct netxen_adapter );
	}; /* netxen_adapter structure */		}; /* netxen_adapter structure */

	/* Max number of xmit producer threads that can run simultaneously */		/* Max number of xmit producer threads that can run simultaneously */
	#define MAX_XMIT_PRODUCERS 16		#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 work_struct tx_timeout_task;
	};

	#define PCI_OFFSET_FIRST_RANGE(adapter, off) \		#define PCI_OFFSET_FIRST_RANGE(adapter, off) \
	((adapter)->ahw.pci_base0 + (off))		((adapter)->ahw.pci_base0 + (off))
	#define PCI_OFFSET_SECOND_RANGE(adapter, off) \		#define PCI_OFFSET_SECOND_RANGE(adapter, off) \
	@@ -1011,8 +994,8 @@ int netxen_niu_gbe_phy_write(struct netxen_adapter *adapter, long phy,
	long reg, __u32 val);		long reg, __u32 val);

	/* Functions available from netxen_nic_hw.c */		/* Functions available from netxen_nic_hw.c */
	int netxen_nic_set_mtu_xgb(struct netxen_port *port, int new_mtu);		int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu);
	int netxen_nic_set_mtu_gb(struct netxen_port *port, int new_mtu);		int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu);
	void netxen_nic_init_niu_gb(struct netxen_adapter *adapter);		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_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw);
	void netxen_nic_reg_write(struct netxen_adapter *adapter, u64 off, u32 val);		void netxen_nic_reg_write(struct netxen_adapter *adapter, u64 off, u32 val);
	@@ -1051,11 +1034,8 @@ int netxen_do_rom_se(struct netxen_adapter *adapter, int addr);

	/* Functions from netxen_nic_isr.c */		/* Functions from netxen_nic_isr.c */
	void netxen_nic_isr_other(struct netxen_adapter *adapter);		void netxen_nic_isr_other(struct netxen_adapter *adapter);
	void netxen_indicate_link_status(struct netxen_adapter *adapter, u32 port,		void netxen_indicate_link_status(struct netxen_adapter *adapter, u32 link);
	u32 link);		void netxen_handle_port_int(struct netxen_adapter *adapter, u32 enable);
	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_sw(struct netxen_adapter *adapter);
	void netxen_initialize_adapter_hw(struct netxen_adapter *adapter);		void netxen_initialize_adapter_hw(struct netxen_adapter *adapter);
	void netxen_alloc(struct pci_dev pdev, size_t sz, dma_addr_t * ptr,		void netxen_alloc(struct pci_dev pdev, size_t sz, dma_addr_t * ptr,
	@@ -1110,6 +1090,7 @@ static inline void netxen_nic_enable_int(struct netxen_adapter *adapter)

	if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {		if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
	mask = 0xbff;		mask = 0xbff;
			writel(0X0, NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
	writel(mask, PCI_OFFSET_SECOND_RANGE(adapter,		writel(mask, PCI_OFFSET_SECOND_RANGE(adapter,
	ISR_INT_TARGET_MASK));		ISR_INT_TARGET_MASK));
	}		}

drivers/net/netxen/netxen_nic_ethtool.c

+38 −45

Original line number	Original line	Diff line number	Diff line
	@@ -50,8 +50,8 @@ struct netxen_nic_stats {
	int stat_offset;		int stat_offset;
	};		};

	#define NETXEN_NIC_STAT(m) sizeof(((struct netxen_port *)0)->m), \		#define NETXEN_NIC_STAT(m) sizeof(((struct netxen_adapter *)0)->m), \
	offsetof(struct netxen_port, m)		offsetof(struct netxen_adapter, m)

	#define NETXEN_NIC_PORT_WINDOW 0x10000		#define NETXEN_NIC_PORT_WINDOW 0x10000
	#define NETXEN_NIC_INVALID_DATA 0xDEADBEEF		#define NETXEN_NIC_INVALID_DATA 0xDEADBEEF
	@@ -100,8 +100,7 @@ static int netxen_nic_get_eeprom_len(struct net_device *dev)
	static void		static void
	netxen_nic_get_drvinfo(struct net_device dev, struct ethtool_drvinfo drvinfo)		netxen_nic_get_drvinfo(struct net_device dev, struct ethtool_drvinfo drvinfo)
	{		{
	struct netxen_port *port = netdev_priv(dev);		struct netxen_adapter *adapter = netdev_priv(dev);
	struct netxen_adapter *adapter = port->adapter;
	u32 fw_major = 0;		u32 fw_major = 0;
	u32 fw_minor = 0;		u32 fw_minor = 0;
	u32 fw_build = 0;		u32 fw_build = 0;
	@@ -115,7 +114,7 @@ netxen_nic_get_drvinfo(struct net_device dev, struct ethtool_drvinfo drvinfo)
	fw_build = readl(NETXEN_CRB_NORMALIZE(adapter, NETXEN_FW_VERSION_SUB));		fw_build = readl(NETXEN_CRB_NORMALIZE(adapter, NETXEN_FW_VERSION_SUB));
	sprintf(drvinfo->fw_version, "%d.%d.%d", fw_major, fw_minor, fw_build);		sprintf(drvinfo->fw_version, "%d.%d.%d", fw_major, fw_minor, fw_build);

	strncpy(drvinfo->bus_info, pci_name(port->pdev), 32);		strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
	drvinfo->n_stats = NETXEN_NIC_STATS_LEN;		drvinfo->n_stats = NETXEN_NIC_STATS_LEN;
	drvinfo->testinfo_len = NETXEN_NIC_TEST_LEN;		drvinfo->testinfo_len = NETXEN_NIC_TEST_LEN;
	drvinfo->regdump_len = NETXEN_NIC_REGS_LEN;		drvinfo->regdump_len = NETXEN_NIC_REGS_LEN;
	@@ -125,8 +124,7 @@ netxen_nic_get_drvinfo(struct net_device dev, struct ethtool_drvinfo drvinfo)
	static int		static int
	netxen_nic_get_settings(struct net_device dev, struct ethtool_cmd ecmd)		netxen_nic_get_settings(struct net_device dev, struct ethtool_cmd ecmd)
	{		{
	struct netxen_port *port = netdev_priv(dev);		struct netxen_adapter *adapter = netdev_priv(dev);
	struct netxen_adapter *adapter = port->adapter;
	struct netxen_board_info *boardinfo = &adapter->ahw.boardcfg;		struct netxen_board_info *boardinfo = &adapter->ahw.boardcfg;

	/* read which mode */		/* read which mode */
	@@ -146,8 +144,8 @@ netxen_nic_get_settings(struct net_device dev, struct ethtool_cmd ecmd)
	ecmd->port = PORT_TP;		ecmd->port = PORT_TP;

	if (netif_running(dev)) {		if (netif_running(dev)) {
	ecmd->speed = port->link_speed;		ecmd->speed = adapter->link_speed;
	ecmd->duplex = port->link_duplex;		ecmd->duplex = adapter->link_duplex;
	} else		} else
	return -EIO; /* link absent */		return -EIO; /* link absent */
	} else if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {		} else if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {
	@@ -165,7 +163,7 @@ netxen_nic_get_settings(struct net_device dev, struct ethtool_cmd ecmd)
	} else		} else
	return -EIO;		return -EIO;

	ecmd->phy_address = port->portnum;		ecmd->phy_address = adapter->portnum;
	ecmd->transceiver = XCVR_EXTERNAL;		ecmd->transceiver = XCVR_EXTERNAL;

	switch ((netxen_brdtype_t) boardinfo->board_type) {		switch ((netxen_brdtype_t) boardinfo->board_type) {
	@@ -179,7 +177,7 @@ netxen_nic_get_settings(struct net_device dev, struct ethtool_cmd ecmd)
	ecmd->port = PORT_TP;		ecmd->port = PORT_TP;
	ecmd->autoneg = (boardinfo->board_type ==		ecmd->autoneg = (boardinfo->board_type ==
	NETXEN_BRDTYPE_P2_SB31_10G_CX4) ?		NETXEN_BRDTYPE_P2_SB31_10G_CX4) ?
	(AUTONEG_DISABLE) : (port->link_autoneg);		(AUTONEG_DISABLE) : (adapter->link_autoneg);
	break;		break;
	case NETXEN_BRDTYPE_P2_SB31_10G_HMEZ:		case NETXEN_BRDTYPE_P2_SB31_10G_HMEZ:
	case NETXEN_BRDTYPE_P2_SB31_10G_IMEZ:		case NETXEN_BRDTYPE_P2_SB31_10G_IMEZ:
	@@ -206,23 +204,22 @@ netxen_nic_get_settings(struct net_device dev, struct ethtool_cmd ecmd)
	static int		static int
	netxen_nic_set_settings(struct net_device dev, struct ethtool_cmd ecmd)		netxen_nic_set_settings(struct net_device dev, struct ethtool_cmd ecmd)
	{		{
	struct netxen_port *port = netdev_priv(dev);		struct netxen_adapter *adapter = netdev_priv(dev);
	struct netxen_adapter *adapter = port->adapter;
	__u32 status;		__u32 status;

	/* read which mode */		/* read which mode */
	if (adapter->ahw.board_type == NETXEN_NIC_GBE) {		if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
	/* autonegotiation */		/* autonegotiation */
	if (adapter->phy_write		if (adapter->phy_write
	&& adapter->phy_write(adapter, port->portnum,		&& adapter->phy_write(adapter, adapter->portnum,
	NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,		NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
	ecmd->autoneg) != 0)		ecmd->autoneg) != 0)
	return -EIO;		return -EIO;
	else		else
	port->link_autoneg = ecmd->autoneg;		adapter->link_autoneg = ecmd->autoneg;

	if (adapter->phy_read		if (adapter->phy_read
	&& adapter->phy_read(adapter, port->portnum,		&& adapter->phy_read(adapter, adapter->portnum,
	NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,		NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
	&status) != 0)		&status) != 0)
	return -EIO;		return -EIO;
	@@ -245,13 +242,13 @@ netxen_nic_set_settings(struct net_device dev, struct ethtool_cmd ecmd)
	if (ecmd->duplex == DUPLEX_FULL)		if (ecmd->duplex == DUPLEX_FULL)
	netxen_set_phy_duplex(status);		netxen_set_phy_duplex(status);
	if (adapter->phy_write		if (adapter->phy_write
	&& adapter->phy_write(adapter, port->portnum,		&& adapter->phy_write(adapter, adapter->portnum,
	NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,		NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
	((int )&status)) != 0)		((int )&status)) != 0)
	return -EIO;		return -EIO;
	else {		else {
	port->link_speed = ecmd->speed;		adapter->link_speed = ecmd->speed;
	port->link_duplex = ecmd->duplex;		adapter->link_duplex = ecmd->duplex;
	}		}
	} else		} else
	return -EOPNOTSUPP;		return -EOPNOTSUPP;
	@@ -360,15 +357,14 @@ static struct netxen_niu_regs niu_registers[] = {
	static void		static void
	netxen_nic_get_regs(struct net_device dev, struct ethtool_regs regs, void *p)		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 = netdev_priv(dev);
	struct netxen_adapter *adapter = port->adapter;
	__u32 mode, *regs_buff = p;		__u32 mode, *regs_buff = p;
	void __iomem *addr;		void __iomem *addr;
	int i, window;		int i, window;

	memset(p, 0, NETXEN_NIC_REGS_LEN);		memset(p, 0, NETXEN_NIC_REGS_LEN);
	regs->version = (1 << 24) \| (adapter->ahw.revision_id << 16) \|		regs->version = (1 << 24) \| (adapter->ahw.revision_id << 16) \|
	(port->pdev)->device;		(adapter->pdev)->device;
	/* which mode */		/* which mode */
	NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_MODE, &regs_buff[0]);		NETXEN_NIC_LOCKED_READ_REG(NETXEN_NIU_MODE, &regs_buff[0]);
	mode = regs_buff[0];		mode = regs_buff[0];
	@@ -383,7 +379,8 @@ netxen_nic_get_regs(struct net_device dev, struct ethtool_regs regs, void *p)
	for (i = 3; niu_registers[mode].reg[i - 3] != -1; i++) {		for (i = 3; niu_registers[mode].reg[i - 3] != -1; i++) {
	/* GB: port specific registers */		/* GB: port specific registers */
	if (mode == 0 && i >= 19)		if (mode == 0 && i >= 19)
	window = port->portnum * NETXEN_NIC_PORT_WINDOW;		window = adapter->portnum *
			NETXEN_NIC_PORT_WINDOW;

	NETXEN_NIC_LOCKED_READ_REG(niu_registers[mode].		NETXEN_NIC_LOCKED_READ_REG(niu_registers[mode].
	reg[i - 3] + window,		reg[i - 3] + window,
	@@ -395,15 +392,14 @@ netxen_nic_get_regs(struct net_device dev, struct ethtool_regs regs, void *p)

	static u32 netxen_nic_test_link(struct net_device *dev)		static u32 netxen_nic_test_link(struct net_device *dev)
	{		{
	struct netxen_port *port = netdev_priv(dev);		struct netxen_adapter *adapter = netdev_priv(dev);
	struct netxen_adapter *adapter = port->adapter;
	__u32 status;		__u32 status;
	int val;		int val;

	/* read which mode */		/* read which mode */
	if (adapter->ahw.board_type == NETXEN_NIC_GBE) {		if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
	if (adapter->phy_read		if (adapter->phy_read
	&& adapter->phy_read(adapter, port->portnum,		&& adapter->phy_read(adapter, adapter->portnum,
	NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,		NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
	&status) != 0)		&status) != 0)
	return -EIO;		return -EIO;
	@@ -422,15 +418,15 @@ static int
	netxen_nic_get_eeprom(struct net_device dev, struct ethtool_eeprom eeprom,		netxen_nic_get_eeprom(struct net_device dev, struct ethtool_eeprom eeprom,
	u8 * bytes)		u8 * bytes)
	{		{
	struct netxen_port *port = netdev_priv(dev);		struct netxen_adapter *adapter = netdev_priv(dev);
	struct netxen_adapter *adapter = port->adapter;
	int offset;		int offset;
	int ret;		int ret;

	if (eeprom->len == 0)		if (eeprom->len == 0)
	return -EINVAL;		return -EINVAL;

	eeprom->magic = (port->pdev)->vendor \| ((port->pdev)->device << 16);		eeprom->magic = (adapter->pdev)->vendor \|
			((adapter->pdev)->device << 16);
	offset = eeprom->offset;		offset = eeprom->offset;

	ret = netxen_rom_fast_read_words(adapter, offset, bytes,		ret = netxen_rom_fast_read_words(adapter, offset, bytes,
	@@ -445,8 +441,7 @@ static int
	netxen_nic_set_eeprom(struct net_device dev, struct ethtool_eeprom eeprom,		netxen_nic_set_eeprom(struct net_device dev, struct ethtool_eeprom eeprom,
	u8 * bytes)		u8 * bytes)
	{		{
	struct netxen_port *port = netdev_priv(dev);		struct netxen_adapter *adapter = netdev_priv(dev);
	struct netxen_adapter *adapter = port->adapter;
	int offset = eeprom->offset;		int offset = eeprom->offset;
	static int flash_start;		static int flash_start;
	static int ready_to_flash;		static int ready_to_flash;
	@@ -516,8 +511,7 @@ netxen_nic_set_eeprom(struct net_device dev, struct ethtool_eeprom eeprom,
	static void		static void
	netxen_nic_get_ringparam(struct net_device dev, struct ethtool_ringparam ring)		netxen_nic_get_ringparam(struct net_device dev, struct ethtool_ringparam ring)
	{		{
	struct netxen_port *port = netdev_priv(dev);		struct netxen_adapter *adapter = netdev_priv(dev);
	struct netxen_adapter *adapter = port->adapter;
	int i;		int i;

	ring->rx_pending = 0;		ring->rx_pending = 0;
	@@ -541,19 +535,18 @@ static void
	netxen_nic_get_pauseparam(struct net_device *dev,		netxen_nic_get_pauseparam(struct net_device *dev,
	struct ethtool_pauseparam *pause)		struct ethtool_pauseparam *pause)
	{		{
	struct netxen_port *port = netdev_priv(dev);		struct netxen_adapter *adapter = netdev_priv(dev);
	struct netxen_adapter *adapter = port->adapter;
	__u32 val;		__u32 val;

	if (adapter->ahw.board_type == NETXEN_NIC_GBE) {		if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
	/* get flow control settings */		/* get flow control settings */
	netxen_nic_read_w0(adapter,		netxen_nic_read_w0(adapter,
	NETXEN_NIU_GB_MAC_CONFIG_0(port->portnum),		NETXEN_NIU_GB_MAC_CONFIG_0(adapter->portnum),
	&val);		&val);
	pause->rx_pause = netxen_gb_get_rx_flowctl(val);		pause->rx_pause = netxen_gb_get_rx_flowctl(val);
	pause->tx_pause = netxen_gb_get_tx_flowctl(val);		pause->tx_pause = netxen_gb_get_tx_flowctl(val);
	/* get autoneg settings */		/* get autoneg settings */
	pause->autoneg = port->link_autoneg;		pause->autoneg = adapter->link_autoneg;
	}		}
	}		}

	@@ -561,8 +554,7 @@ static int
	netxen_nic_set_pauseparam(struct net_device *dev,		netxen_nic_set_pauseparam(struct net_device *dev,
	struct ethtool_pauseparam *pause)		struct ethtool_pauseparam *pause)
	{		{
	struct netxen_port *port = netdev_priv(dev);		struct netxen_adapter *adapter = netdev_priv(dev);
	struct netxen_adapter *adapter = port->adapter;
	__u32 val;		__u32 val;
	unsigned int autoneg;		unsigned int autoneg;

	@@ -570,7 +562,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,
	if (adapter->ahw.board_type == NETXEN_NIC_GBE) {		if (adapter->ahw.board_type == NETXEN_NIC_GBE) {
	/* set flow control */		/* set flow control */
	netxen_nic_read_w0(adapter,		netxen_nic_read_w0(adapter,
	NETXEN_NIU_GB_MAC_CONFIG_0(port->portnum),		NETXEN_NIU_GB_MAC_CONFIG_0(adapter->portnum),
	(u32 *) & val);		(u32 *) & val);
	if (pause->tx_pause)		if (pause->tx_pause)
	netxen_gb_tx_flowctl(val);		netxen_gb_tx_flowctl(val);
	@@ -582,17 +574,17 @@ netxen_nic_set_pauseparam(struct net_device *dev,
	netxen_gb_unset_rx_flowctl(val);		netxen_gb_unset_rx_flowctl(val);

	netxen_nic_write_w0(adapter,		netxen_nic_write_w0(adapter,
	NETXEN_NIU_GB_MAC_CONFIG_0(port->portnum),		NETXEN_NIU_GB_MAC_CONFIG_0(adapter->portnum),
	*&val);		*&val);
	/* set autoneg */		/* set autoneg */
	autoneg = pause->autoneg;		autoneg = pause->autoneg;
	if (adapter->phy_write		if (adapter->phy_write
	&& adapter->phy_write(adapter, port->portnum,		&& adapter->phy_write(adapter, adapter->portnum,
	NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,		NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
	autoneg) != 0)		autoneg) != 0)
	return -EIO;		return -EIO;
	else {		else {
	port->link_autoneg = pause->autoneg;		adapter->link_autoneg = pause->autoneg;
	return 0;		return 0;
	}		}
	} else		} else
	@@ -675,12 +667,13 @@ static void
	netxen_nic_get_ethtool_stats(struct net_device *dev,		netxen_nic_get_ethtool_stats(struct net_device *dev,
	struct ethtool_stats stats, u64 data)		struct ethtool_stats stats, u64 data)
	{		{
	struct netxen_port *port = netdev_priv(dev);		struct netxen_adapter *adapter = netdev_priv(dev);
	int index;		int index;

	for (index = 0; index < NETXEN_NIC_STATS_LEN; index++) {		for (index = 0; index < NETXEN_NIC_STATS_LEN; index++) {
	char *p =		char *p =
	(char *)port + netxen_nic_gstrings_stats[index].stat_offset;		(char *)adapter +
			netxen_nic_gstrings_stats[index].stat_offset;
	data[index] =		data[index] =
	(netxen_nic_gstrings_stats[index].sizeof_stat ==		(netxen_nic_gstrings_stats[index].sizeof_stat ==
	sizeof(u64)) ? (u64 ) p : (u32 ) p;		sizeof(u64)) ? (u64 ) p : (u32 ) p;

drivers/net/netxen/netxen_nic_hdr.h

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -649,11 +649,19 @@ enum {
	#define PCIX_MS_WINDOW (0x10204)		#define PCIX_MS_WINDOW (0x10204)
	#define PCIX_SN_WINDOW (0x10208)		#define PCIX_SN_WINDOW (0x10208)
	#define PCIX_CRB_WINDOW (0x10210)		#define PCIX_CRB_WINDOW (0x10210)
			#define PCIX_CRB_WINDOW_F0 (0x10210)
			#define PCIX_CRB_WINDOW_F1 (0x10230)
			#define PCIX_CRB_WINDOW_F2 (0x10250)
			#define PCIX_CRB_WINDOW_F3 (0x10270)

	#define PCIX_TARGET_STATUS (0x10118)		#define PCIX_TARGET_STATUS (0x10118)
	#define PCIX_TARGET_MASK (0x10128)		#define PCIX_TARGET_MASK (0x10128)

	#define PCIX_MSI_F0 (0x13000)		#define PCIX_MSI_F0 (0x13000)
			#define PCIX_MSI_F1 (0x13004)
			#define PCIX_MSI_F2 (0x13008)
			#define PCIX_MSI_F3 (0x1300c)
			#define PCIX_MSI_F(i) (0x13000+((i)*4))

	#define PCIX_PS_MEM_SPACE (0x90000)		#define PCIX_PS_MEM_SPACE (0x90000)

drivers/net/netxen/netxen_nic_hw.c

+168 −53

Original line number	Original line	Diff line number	Diff line
	@@ -33,10 +33,128 @@

	#include "netxen_nic.h"		#include "netxen_nic.h"
	#include "netxen_nic_hw.h"		#include "netxen_nic_hw.h"
			#define DEFINE_GLOBAL_RECV_CRB
	#include "netxen_nic_phan_reg.h"		#include "netxen_nic_phan_reg.h"


	#include <net/ip.h>		#include <net/ip.h>

			struct netxen_recv_crb recv_crb_registers[] = {
			/*
			* Instance 0.
			*/
			{
			/* rcv_desc_crb: */
			{
			{
			/* crb_rcv_producer_offset: */
			NETXEN_NIC_REG(0x100),
			/* crb_rcv_consumer_offset: */
			NETXEN_NIC_REG(0x104),
			/* crb_gloablrcv_ring: */
			NETXEN_NIC_REG(0x108),
			/* crb_rcv_ring_size */
			NETXEN_NIC_REG(0x10c),

			},
			/* Jumbo frames */
			{
			/* crb_rcv_producer_offset: */
			NETXEN_NIC_REG(0x110),
			/* crb_rcv_consumer_offset: */
			NETXEN_NIC_REG(0x114),
			/* crb_gloablrcv_ring: */
			NETXEN_NIC_REG(0x118),
			/* crb_rcv_ring_size */
			NETXEN_NIC_REG(0x11c),
			},
			/* LRO */
			{
			/* crb_rcv_producer_offset: */
			NETXEN_NIC_REG(0x120),
			/* crb_rcv_consumer_offset: */
			NETXEN_NIC_REG(0x124),
			/* crb_gloablrcv_ring: */
			NETXEN_NIC_REG(0x128),
			/* crb_rcv_ring_size */
			NETXEN_NIC_REG(0x12c),
			}
			},
			/* crb_rcvstatus_ring: */
			NETXEN_NIC_REG(0x130),
			/* crb_rcv_status_producer: */
			NETXEN_NIC_REG(0x134),
			/* crb_rcv_status_consumer: */
			NETXEN_NIC_REG(0x138),
			/* crb_rcvpeg_state: */
			NETXEN_NIC_REG(0x13c),
			/* crb_status_ring_size */
			NETXEN_NIC_REG(0x140),

			},
			/*
			* Instance 1,
			*/
			{
			/* rcv_desc_crb: */
			{
			{
			/* crb_rcv_producer_offset: */
			NETXEN_NIC_REG(0x144),
			/* crb_rcv_consumer_offset: */
			NETXEN_NIC_REG(0x148),
			/* crb_globalrcv_ring: */
			NETXEN_NIC_REG(0x14c),
			/* crb_rcv_ring_size */
			NETXEN_NIC_REG(0x150),

			},
			/* Jumbo frames */
			{
			/* crb_rcv_producer_offset: */
			NETXEN_NIC_REG(0x154),
			/* crb_rcv_consumer_offset: */
			NETXEN_NIC_REG(0x158),
			/* crb_globalrcv_ring: */
			NETXEN_NIC_REG(0x15c),
			/* crb_rcv_ring_size */
			NETXEN_NIC_REG(0x160),
			},
			/* LRO */
			{
			/* crb_rcv_producer_offset: */
			NETXEN_NIC_REG(0x164),
			/* crb_rcv_consumer_offset: */
			NETXEN_NIC_REG(0x168),
			/* crb_globalrcv_ring: */
			NETXEN_NIC_REG(0x16c),
			/* crb_rcv_ring_size */
			NETXEN_NIC_REG(0x170),
			}

			},
			/* crb_rcvstatus_ring: */
			NETXEN_NIC_REG(0x174),
			/* crb_rcv_status_producer: */
			NETXEN_NIC_REG(0x178),
			/* crb_rcv_status_consumer: */
			NETXEN_NIC_REG(0x17c),
			/* crb_rcvpeg_state: */
			NETXEN_NIC_REG(0x180),
			/* crb_status_ring_size */
			NETXEN_NIC_REG(0x184),

			},
			};

			u64 ctx_addr_sig_regs[][3] = {
			{NETXEN_NIC_REG(0x188), NETXEN_NIC_REG(0x18c), NETXEN_NIC_REG(0x1c0)},
			{NETXEN_NIC_REG(0x190), NETXEN_NIC_REG(0x194), NETXEN_NIC_REG(0x1c4)},
			{NETXEN_NIC_REG(0x198), NETXEN_NIC_REG(0x19c), NETXEN_NIC_REG(0x1c8)},
			{NETXEN_NIC_REG(0x1a0), NETXEN_NIC_REG(0x1a4), NETXEN_NIC_REG(0x1cc)}
			};


	/* PCI Windowing for DDR regions. */		/* PCI Windowing for DDR regions. */

	#define ADDR_IN_RANGE(addr, low, high) \		#define ADDR_IN_RANGE(addr, low, high) \
	@@ -70,8 +188,7 @@ void netxen_free_hw_resources(struct netxen_adapter *adapter);

	int netxen_nic_set_mac(struct net_device netdev, void p)		int netxen_nic_set_mac(struct net_device netdev, void p)
	{		{
	struct netxen_port *port = netdev_priv(netdev);		struct netxen_adapter *adapter = netdev_priv(netdev);
	struct netxen_adapter *adapter = port->adapter;
	struct sockaddr *addr = p;		struct sockaddr *addr = p;

	if (netif_running(netdev))		if (netif_running(netdev))
	@@ -84,7 +201,7 @@ int netxen_nic_set_mac(struct net_device netdev, void p)
	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);		memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);

	if (adapter->macaddr_set)		if (adapter->macaddr_set)
	adapter->macaddr_set(port, addr->sa_data);		adapter->macaddr_set(adapter, addr->sa_data);

	return 0;		return 0;
	}		}
	@@ -94,8 +211,7 @@ int netxen_nic_set_mac(struct net_device netdev, void p)
	*/		*/
	void netxen_nic_set_multi(struct net_device *netdev)		void netxen_nic_set_multi(struct net_device *netdev)
	{		{
	struct netxen_port *port = netdev_priv(netdev);		struct netxen_adapter *adapter = netdev_priv(netdev);
	struct netxen_adapter *adapter = port->adapter;
	struct dev_mc_list *mc_ptr;		struct dev_mc_list *mc_ptr;
	__u32 netxen_mac_addr_cntl_data = 0;		__u32 netxen_mac_addr_cntl_data = 0;

	@@ -103,14 +219,12 @@ void netxen_nic_set_multi(struct net_device *netdev)
	if (netdev->flags & IFF_PROMISC) {		if (netdev->flags & IFF_PROMISC) {
	if (adapter->set_promisc)		if (adapter->set_promisc)
	adapter->set_promisc(adapter,		adapter->set_promisc(adapter,
	port->portnum,
	NETXEN_NIU_PROMISC_MODE);		NETXEN_NIU_PROMISC_MODE);
	} else {		} else {
	if (adapter->unset_promisc &&		if (adapter->unset_promisc &&
	adapter->ahw.boardcfg.board_type		adapter->ahw.boardcfg.board_type
	!= NETXEN_BRDTYPE_P2_SB31_10G_IMEZ)		!= NETXEN_BRDTYPE_P2_SB31_10G_IMEZ)
	adapter->unset_promisc(adapter,		adapter->unset_promisc(adapter,
	port->portnum,
	NETXEN_NIU_NON_PROMISC_MODE);		NETXEN_NIU_NON_PROMISC_MODE);
	}		}
	if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {		if (adapter->ahw.board_type == NETXEN_NIC_XGBE) {
	@@ -152,8 +266,7 @@ void netxen_nic_set_multi(struct net_device *netdev)
	*/		*/
	int netxen_nic_change_mtu(struct net_device *netdev, int mtu)		int netxen_nic_change_mtu(struct net_device *netdev, int mtu)
	{		{
	struct netxen_port *port = netdev_priv(netdev);		struct netxen_adapter *adapter = netdev_priv(netdev);
	struct netxen_adapter *adapter = port->adapter;
	int eff_mtu = mtu + NETXEN_ENET_HEADER_SIZE + NETXEN_ETH_FCS_SIZE;		int eff_mtu = mtu + NETXEN_ENET_HEADER_SIZE + NETXEN_ETH_FCS_SIZE;

	if ((eff_mtu > NETXEN_MAX_MTU) \|\| (eff_mtu < NETXEN_MIN_MTU)) {		if ((eff_mtu > NETXEN_MAX_MTU) \|\| (eff_mtu < NETXEN_MIN_MTU)) {
	@@ -163,7 +276,7 @@ int netxen_nic_change_mtu(struct net_device *netdev, int mtu)
	}		}

	if (adapter->set_mtu)		if (adapter->set_mtu)
	adapter->set_mtu(port, mtu);		adapter->set_mtu(adapter, mtu);
	netdev->mtu = mtu;		netdev->mtu = mtu;

	return 0;		return 0;
	@@ -229,7 +342,7 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
	(dma_addr_t *) & adapter->ctx_desc_phys_addr,		(dma_addr_t *) & adapter->ctx_desc_phys_addr,
	&adapter->ctx_desc_pdev);		&adapter->ctx_desc_pdev);

	printk("ctx_desc_phys_addr: 0x%llx\n",		printk(KERN_INFO "ctx_desc_phys_addr: 0x%llx\n",
	(unsigned long long) adapter->ctx_desc_phys_addr);		(unsigned long long) adapter->ctx_desc_phys_addr);
	if (addr == NULL) {		if (addr == NULL) {
	DPRINTK(ERR, "bad return from pci_alloc_consistent\n");		DPRINTK(ERR, "bad return from pci_alloc_consistent\n");
	@@ -249,7 +362,7 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
	adapter->max_tx_desc_count,		adapter->max_tx_desc_count,
	(dma_addr_t *) & hw->cmd_desc_phys_addr,		(dma_addr_t *) & hw->cmd_desc_phys_addr,
	&adapter->ahw.cmd_desc_pdev);		&adapter->ahw.cmd_desc_pdev);
	printk("cmd_desc_phys_addr: 0x%llx\n",		printk(KERN_INFO "cmd_desc_phys_addr: 0x%llx\n",
	(unsigned long long) hw->cmd_desc_phys_addr);		(unsigned long long) hw->cmd_desc_phys_addr);

	if (addr == NULL) {		if (addr == NULL) {
	@@ -385,7 +498,6 @@ void netxen_tso_check(struct netxen_adapter *adapter,
	return;		return;
	}		}
	}		}
	adapter->stats.xmitcsummed++;
	desc->tcp_hdr_offset = skb_transport_offset(skb);		desc->tcp_hdr_offset = skb_transport_offset(skb);
	desc->ip_hdr_offset = skb_network_offset(skb);		desc->ip_hdr_offset = skb_network_offset(skb);
	}		}
	@@ -475,7 +587,30 @@ void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw)

	if (adapter->curr_window == wndw)		if (adapter->curr_window == wndw)
	return;		return;
			switch(adapter->portnum) {
			case 0:
			offset = PCI_OFFSET_SECOND_RANGE(adapter,
			NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW));
			break;
			case 1:
			offset = PCI_OFFSET_SECOND_RANGE(adapter,
			NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW_F1));
			break;
			case 2:
			offset = PCI_OFFSET_SECOND_RANGE(adapter,
			NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW_F2));
			break;
			case 3:
			offset = PCI_OFFSET_SECOND_RANGE(adapter,
			NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW_F3));
			break;
			default:
			printk(KERN_INFO "Changing the window for PCI function"
			"%d\n", adapter->portnum);
			offset = PCI_OFFSET_SECOND_RANGE(adapter,
			NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW));
			break;
			}
	/*		/*
	* Move the CRB window.		* Move the CRB window.
	* We need to write to the "direct access" region of PCI		* We need to write to the "direct access" region of PCI
	@@ -484,9 +619,6 @@ void netxen_nic_pci_change_crbwindow(struct netxen_adapter *adapter, u32 wndw)
	* register address is received by PCI. The direct region bypasses		* register address is received by PCI. The direct region bypasses
	* the CRB bus.		* the CRB bus.
	*/		*/
	offset =
	PCI_OFFSET_SECOND_RANGE(adapter,
	NETXEN_PCIX_PH_REG(PCIX_CRB_WINDOW));

	if (wndw & 0x1)		if (wndw & 0x1)
	wndw = NETXEN_WINDOW_ONE;		wndw = NETXEN_WINDOW_ONE;
	@@ -810,43 +942,27 @@ int netxen_nic_get_board_info(struct netxen_adapter *adapter)

	/* NIU access sections */		/* NIU access sections */

	int netxen_nic_set_mtu_gb(struct netxen_port *port, int new_mtu)		int netxen_nic_set_mtu_gb(struct netxen_adapter *adapter, int new_mtu)
	{		{
	struct netxen_adapter *adapter = port->adapter;
	netxen_nic_write_w0(adapter,		netxen_nic_write_w0(adapter,
	NETXEN_NIU_GB_MAX_FRAME_SIZE(port->portnum),		NETXEN_NIU_GB_MAX_FRAME_SIZE(adapter->portnum),
	new_mtu);		new_mtu);
	return 0;		return 0;
	}		}

	int netxen_nic_set_mtu_xgb(struct netxen_port *port, int new_mtu)		int netxen_nic_set_mtu_xgb(struct netxen_adapter *adapter, int new_mtu)
	{		{
	struct netxen_adapter *adapter = port->adapter;
	new_mtu += NETXEN_NIU_HDRSIZE + NETXEN_NIU_TLRSIZE;		new_mtu += NETXEN_NIU_HDRSIZE + NETXEN_NIU_TLRSIZE;
	if (port->portnum == 0)		if (adapter->portnum == 0)
	netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE, new_mtu);		netxen_nic_write_w0(adapter, NETXEN_NIU_XGE_MAX_FRAME_SIZE, new_mtu);
	else if (port->portnum == 1)		else if (adapter->portnum == 1)
	netxen_nic_write_w0(adapter, NETXEN_NIU_XG1_MAX_FRAME_SIZE, new_mtu);		netxen_nic_write_w0(adapter, NETXEN_NIU_XG1_MAX_FRAME_SIZE, new_mtu);
	return 0;		return 0;
	}		}

	void netxen_nic_init_niu_gb(struct netxen_adapter *adapter)		void netxen_nic_init_niu_gb(struct netxen_adapter *adapter)
	{		{
	int portno;		netxen_niu_gbe_init_port(adapter, adapter->portnum);
	for (portno = 0; portno < NETXEN_NIU_MAX_GBE_PORTS; portno++)
	netxen_niu_gbe_init_port(adapter, portno);
	}

	void netxen_nic_stop_all_ports(struct netxen_adapter *adapter)
	{
	int port_nr;
	struct netxen_port *port;

	for (port_nr = 0; port_nr < adapter->ahw.max_ports; port_nr++) {
	port = adapter->port[port_nr];
	if (adapter->stop_port)
	adapter->stop_port(adapter, port->portnum);
	}
	}		}

	void		void
	@@ -865,9 +981,8 @@ netxen_crb_writelit_adapter(struct netxen_adapter *adapter, unsigned long off,
	}		}
	}		}

	void netxen_nic_set_link_parameters(struct netxen_port *port)		void netxen_nic_set_link_parameters(struct netxen_adapter *adapter)
	{		{
	struct netxen_adapter *adapter = port->adapter;
	__u32 status;		__u32 status;
	__u32 autoneg;		__u32 autoneg;
	__u32 mode;		__u32 mode;
	@@ -876,47 +991,47 @@ void netxen_nic_set_link_parameters(struct netxen_port *port)
	if (netxen_get_niu_enable_ge(mode)) { /* Gb 10/100/1000 Mbps mode */		if (netxen_get_niu_enable_ge(mode)) { /* Gb 10/100/1000 Mbps mode */
	if (adapter->phy_read		if (adapter->phy_read
	&& adapter->		&& adapter->
	phy_read(adapter, port->portnum,		phy_read(adapter, adapter->portnum,
	NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,		NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
	&status) == 0) {		&status) == 0) {
	if (netxen_get_phy_link(status)) {		if (netxen_get_phy_link(status)) {
	switch (netxen_get_phy_speed(status)) {		switch (netxen_get_phy_speed(status)) {
	case 0:		case 0:
	port->link_speed = SPEED_10;		adapter->link_speed = SPEED_10;
	break;		break;
	case 1:		case 1:
	port->link_speed = SPEED_100;		adapter->link_speed = SPEED_100;
	break;		break;
	case 2:		case 2:
	port->link_speed = SPEED_1000;		adapter->link_speed = SPEED_1000;
	break;		break;
	default:		default:
	port->link_speed = -1;		adapter->link_speed = -1;
	break;		break;
	}		}
	switch (netxen_get_phy_duplex(status)) {		switch (netxen_get_phy_duplex(status)) {
	case 0:		case 0:
	port->link_duplex = DUPLEX_HALF;		adapter->link_duplex = DUPLEX_HALF;
	break;		break;
	case 1:		case 1:
	port->link_duplex = DUPLEX_FULL;		adapter->link_duplex = DUPLEX_FULL;
	break;		break;
	default:		default:
	port->link_duplex = -1;		adapter->link_duplex = -1;
	break;		break;
	}		}
	if (adapter->phy_read		if (adapter->phy_read
	&& adapter->		&& adapter->
	phy_read(adapter, port->portnum,		phy_read(adapter, adapter->portnum,
	NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,		NETXEN_NIU_GB_MII_MGMT_ADDR_AUTONEG,
	&autoneg) != 0)		&autoneg) != 0)
	port->link_autoneg = autoneg;		adapter->link_autoneg = autoneg;
	} else		} else
	goto link_down;		goto link_down;
	} else {		} else {
	link_down:		link_down:
	port->link_speed = -1;		adapter->link_speed = -1;
	port->link_duplex = -1;		adapter->link_duplex = -1;
	}		}
	}		}
	}		}

drivers/net/netxen/netxen_nic_hw.h

+9 −9

File changed.

Preview size limit exceeded, changes collapsed.