]> Pileus Git - ~andy/linux/commitdiff
bnx2: Fix endian swapping on firmware version string
authorMichael Chan <mchan@broadcom.com>
Wed, 20 Jul 2011 14:55:25 +0000 (14:55 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 21 Jul 2011 19:38:32 +0000 (12:38 -0700)
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>
drivers/net/bnx2.c

index 3ad9b70ef1b2bee6030840abbd75017fafda0b4b..4b2b57018a02bdf85b9510bf1e6a96006b4bac7e 100644 (file)
@@ -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], &reg, 4);
                        j += 4;
                }