Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e45d9ab4 authored by Amit S. Kale's avatar Amit S. Kale Committed by Jeff Garzik
Browse files

NetXen: Updates for ethtool support 



NetXen: Updates for ethtool support.

Signed-off-by: default avatarAmit S. Kale <amitkale@netxen.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 9b410117

drivers/net/netxen/netxen_nic.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1040,6 +1040,7 @@ int netxen_flash_unlock(struct netxen_adapter *adapter); 
int netxen_backup_crbinit(struct netxen_adapter *adapter);

int netxen_backup_crbinit(struct netxen_adapter *adapter);

int netxen_flash_erase_secondary(struct netxen_adapter *adapter);

int netxen_flash_erase_secondary(struct netxen_adapter *adapter);

int netxen_flash_erase_primary(struct netxen_adapter *adapter);

int netxen_flash_erase_primary(struct netxen_adapter *adapter);

void netxen_halt_pegs(struct netxen_adapter *adapter);





int netxen_rom_fast_write(struct netxen_adapter *adapter, int addr, int data);

int netxen_rom_fast_write(struct netxen_adapter *adapter, int addr, int data);

int netxen_rom_se(struct netxen_adapter *adapter, int addr);

int netxen_rom_se(struct netxen_adapter *adapter, int addr);

drivers/net/netxen/netxen_nic_ethtool.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -402,7 +402,7 @@ netxen_nic_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) 
	wol->wolopts = 0;

	wol->wolopts = 0;

}

}





static u32 netxen_nic_get_link(struct net_device *dev)

static u32 netxen_nic_test_link(struct net_device *dev)

{

{

	struct netxen_port *port = netdev_priv(dev);

	struct netxen_port *port = netdev_priv(dev);

	struct netxen_adapter *adapter = port->adapter;

	struct netxen_adapter *adapter = port->adapter;
@@ -459,6 +459,7 @@ netxen_nic_set_eeprom(struct net_device *dev, struct ethtool_eeprom *eeprom, 
	int ret;

	int ret;





	if (flash_start == 0) {

	if (flash_start == 0) {

		netxen_halt_pegs(adapter);

		ret = netxen_flash_unlock(adapter);

		ret = netxen_flash_unlock(adapter);

		if (ret < 0) {

		if (ret < 0) {

			printk(KERN_ERR "%s: Flash unlock failed.\n",

			printk(KERN_ERR "%s: Flash unlock failed.\n",
@@ -712,7 +713,7 @@ netxen_nic_diag_test(struct net_device *dev, struct ethtool_test *eth_test, 
{

{

	if (eth_test->flags == ETH_TEST_FL_OFFLINE) {	/* offline tests */

	if (eth_test->flags == ETH_TEST_FL_OFFLINE) {	/* offline tests */

		/* link test */

		/* link test */

		if (!(data[4] = (u64) netxen_nic_get_link(dev)))

		if (!(data[4] = (u64) netxen_nic_test_link(dev)))

			eth_test->flags |= ETH_TEST_FL_FAILED;

			eth_test->flags |= ETH_TEST_FL_FAILED;





		if (netif_running(dev))

		if (netif_running(dev))
@@ -727,7 +728,7 @@ netxen_nic_diag_test(struct net_device *dev, struct ethtool_test *eth_test, 
			dev->open(dev);

			dev->open(dev);

	} else {		/* online tests */

	} else {		/* online tests */

		/* link test */

		/* link test */

		if (!(data[4] = (u64) netxen_nic_get_link(dev)))

		if (!(data[4] = (u64) netxen_nic_test_link(dev)))

			eth_test->flags |= ETH_TEST_FL_FAILED;

			eth_test->flags |= ETH_TEST_FL_FAILED;





		/* other tests pass by default */

		/* other tests pass by default */
@@ -783,7 +784,7 @@ struct ethtool_ops netxen_nic_ethtool_ops = { 
	.get_regs_len = netxen_nic_get_regs_len,

	.get_regs_len = netxen_nic_get_regs_len,

	.get_regs = netxen_nic_get_regs,

	.get_regs = netxen_nic_get_regs,

	.get_wol = netxen_nic_get_wol,

	.get_wol = netxen_nic_get_wol,

	.get_link = netxen_nic_get_link,

	.get_link = ethtool_op_get_link,

	.get_eeprom_len = netxen_nic_get_eeprom_len,

	.get_eeprom_len = netxen_nic_get_eeprom_len,

	.get_eeprom = netxen_nic_get_eeprom,

	.get_eeprom = netxen_nic_get_eeprom,

	.set_eeprom = netxen_nic_set_eeprom,

	.set_eeprom = netxen_nic_set_eeprom,

drivers/net/netxen/netxen_nic_init.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -717,6 +717,14 @@ netxen_flash_erase_primary(struct netxen_adapter *adapter) 
	return ret;

	return ret;

}

}





void netxen_halt_pegs(struct netxen_adapter *adapter)

{

	 netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_0 + 0x3c, 1);

	 netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_1 + 0x3c, 1);

	 netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_2 + 0x3c, 1);

	 netxen_crb_writelit_adapter(adapter, NETXEN_CRB_PEG_NET_3 + 0x3c, 1);

}



int netxen_flash_unlock(struct netxen_adapter *adapter)

int netxen_flash_unlock(struct netxen_adapter *adapter)

{

{

	int ret = 0;

	int ret = 0;