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

Commit de9307c6 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: remove old flash check. 



Remove flash size check which made sense only for ancient
boards with 1MB flash. The check is based on values read
from specific locations and fails with firmware size changes.

This prevents driver from getting right mac addresses.

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5a893922

drivers/net/netxen/netxen_nic.h

+0 −1
Original line number Diff line number Diff line
@@ -1595,7 +1595,6 @@ dma_watchdog_wakeup(struct netxen_adapter *adapter) 
}





int netxen_is_flash_supported(struct netxen_adapter *adapter);

int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac);

int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac);

extern void netxen_change_ringparam(struct netxen_adapter *adapter);

drivers/net/netxen/netxen_nic_hw.c

+0 −22
Original line number Diff line number Diff line
@@ -706,28 +706,6 @@ int netxen_nic_change_mtu(struct net_device *netdev, int mtu) 
	return rc;

}



int netxen_is_flash_supported(struct netxen_adapter *adapter)

{

	const int locs[] = { 0, 0x4, 0x100, 0x4000, 0x4128 };

	int addr, val01, val02, i, j;



	/* if the flash size less than 4Mb, make huge war cry and die */

	for (j = 1; j < 4; j++) {

		addr = j * NETXEN_NIC_WINDOW_MARGIN;

		for (i = 0; i < ARRAY_SIZE(locs); i++) {

			if (netxen_rom_fast_read(adapter, locs[i], &val01) == 0

			    && netxen_rom_fast_read(adapter, (addr + locs[i]),

						    &val02) == 0) {

				if (val01 == val02)

					return -1;

			} else

				return -1;

		}

	}



	return 0;

}



static int netxen_get_flash_block(struct netxen_adapter *adapter, int base,

				  int size, __le32 * buf)

{

drivers/net/netxen/netxen_nic_main.c

+0 −3
Original line number Diff line number Diff line
@@ -405,9 +405,6 @@ netxen_read_mac_addr(struct netxen_adapter *adapter) 
	struct net_device *netdev = adapter->netdev;

	struct pci_dev *pdev = adapter->pdev;



	if (netxen_is_flash_supported(adapter) != 0)

		return -EIO;



	if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {

		if (netxen_p3_get_mac_addr(adapter, &mac_addr) != 0)

			return -EIO;