diff options
| author |   Michael Chan <mchan@broadcom.com> | 2011-07-20 14:55:25 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-07-21 12:38:32 -0700 |
| commit | 3aeb7d2243e55ddcad3c0b402e7b09619a67f5da (patch) | |
| tree | f40fa4dad2f84997636b59b025f340ba7b898b0b /drivers/net/bnx2.c | |
| parent | cnic: Add VLAN ID as a parameter during netevent upcall (diff) | |
| download | linux-dev-3aeb7d2243e55ddcad3c0b402e7b09619a67f5da.tar.xz linux-dev-3aeb7d2243e55ddcad3c0b402e7b09619a67f5da.zip | |
bnx2: Fix endian swapping on firmware version string
so that ethtool -i will display it correctly on big endian systems.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Reviewed-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 3ad9b70ef1b2..4b2b57018a02 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -56,8 +56,8 @@ #include "bnx2_fw.h" #define DRV_MODULE_NAME "bnx2" -#define DRV_MODULE_VERSION "2.1.10" -#define DRV_MODULE_RELDATE "July 12, 2011" +#define DRV_MODULE_VERSION "2.1.11" +#define DRV_MODULE_RELDATE "July 20, 2011" #define FW_MIPS_FILE_06 "bnx2/bnx2-mips-06-6.2.1.fw" #define FW_RV2P_FILE_06 "bnx2/bnx2-rv2p-06-6.0.15.fw" #define FW_MIPS_FILE_09 "bnx2/bnx2-mips-09-6.2.1a.fw" @@ -8097,7 +8097,7 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) bp->fw_version[j++] = ' '; for (i = 0; i < 3 && j < 28; i++) { reg = bnx2_reg_rd_ind(bp, addr + i * 4); - reg = swab32(reg); + reg = be32_to_cpu(reg); memcpy(&bp->fw_version[j], ®, 4); j += 4; } |