diff options
| author |   Dhananjay Phadke <dhananjay@netxen.com> | 2009-10-21 19:39:03 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-10-22 18:27:50 -0700 |
| commit | 0dc6d9cbe7df4d2c3cdf17cd2f78733102b0fea6 (patch) | |
| tree | 8794a499d2c04c3543993fa0b45955f18e102c0b /drivers/net | |
| parent | netxen: fix tx timeout handling on firmware hang (diff) | |
| download | linux-dev-0dc6d9cbe7df4d2c3cdf17cd2f78733102b0fea6.tar.xz linux-dev-0dc6d9cbe7df4d2c3cdf17cd2f78733102b0fea6.zip | |
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: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_hw.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index 32314000dfcd..3185a98b0917 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c @@ -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; } |