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

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

netxen: avoid undue board config check 



Old code assumed board config version in the flash to be 1.
When this will get changed by tools, driver just refuses to
attach. This is unnecessary since driver does not have to
parse board config structure directly (maintained by firmware).

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

drivers/net/netxen/netxen_nic_hw.c

+4 −10
Original line number Diff line number Diff line
@@ -1901,22 +1901,16 @@ netxen_setup_hwops(struct netxen_adapter *adapter) 


int netxen_nic_get_board_info(struct netxen_adapter *adapter)

{

	int offset, board_type, magic, header_version;

	int offset, board_type, magic;

	struct pci_dev *pdev = adapter->pdev;



	offset = NX_FW_MAGIC_OFFSET;

	if (netxen_rom_fast_read(adapter, offset, &magic))

		return -EIO;



	offset = NX_HDR_VERSION_OFFSET;

	if (netxen_rom_fast_read(adapter, offset, &header_version))

		return -EIO;



	if (magic != NETXEN_BDINFO_MAGIC ||

			header_version != NETXEN_BDINFO_VERSION) {

		dev_err(&pdev->dev,

			"invalid board config, magic=%08x, version=%08x\n",

			magic, header_version);

	if (magic != NETXEN_BDINFO_MAGIC) {

		dev_err(&pdev->dev, "invalid board config, magic=%08x\n",

			magic);

		return -EIO;

	}