diff options
| author | Amit Kumar Salecha <amit.salecha@qlogic.com> | 2010-03-26 01:30:07 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-26 19:49:21 +0100 |
| commit | bb2792e0383793d5135ba777e93f0a918371394b (patch) | |
| tree | 48f01a5022fec2429f8eaabac1430919869dfb59 /drivers | |
| parent | Revert "r8169: enable 64-bit DMA by default for PCI Express devices (v2)" (diff) | |
| download | linux-bb2792e0383793d5135ba777e93f0a918371394b.tar.xz linux-bb2792e0383793d5135ba777e93f0a918371394b.zip | |
netxen: fix bios version calculation
Bios sub version from unified fw image is calculated incorrect.
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 1c63610ead42..7eb925a9f36e 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c @@ -761,7 +761,7 @@ nx_get_bios_version(struct netxen_adapter *adapter) if (adapter->fw_type == NX_UNIFIED_ROMIMAGE) { bios_ver = cpu_to_le32(*((u32 *) (&fw->data[prd_off]) + NX_UNI_BIOS_VERSION_OFF)); - return (bios_ver << 24) + ((bios_ver >> 8) & 0xff00) + + return (bios_ver << 16) + ((bios_ver >> 8) & 0xff00) + (bios_ver >> 24); } else return cpu_to_le32(*(u32 *)&fw->data[NX_BIOS_VERSION_OFFSET]); |