qed: Correct order of wwnn and wwpn
authorMintz, Yuval <Yuval.Mintz@cavium.com>
Fri, 2 Jun 2017 05:58:30 +0000 (08:58 +0300)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Jun 2017 14:33:02 +0000 (10:33 -0400)
Driver reads values via HSI splitting this 8-byte into 2 32-bit
values and builds a single u64 field - but it does so by shifting
the lower field instead of the higher.
Luckily, we still don't use these fields for anything - but we're about
to start.

Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/qlogic/qed/qed_mcp.c

index 31c88e192cd015ad6bd863c1f47ed3fe5e7c69a5..e82f32950361a29e98f078a71d1103b4f2af8d88 100644 (file)
@@ -1736,10 +1736,10 @@ int qed_mcp_fill_shmem_func_info(struct qed_hwfn *p_hwfn,
                DP_NOTICE(p_hwfn, "MAC is 0 in shmem\n");
        }
 
-       info->wwn_port = (u64)shmem_info.fcoe_wwn_port_name_upper |
-                        (((u64)shmem_info.fcoe_wwn_port_name_lower) << 32);
-       info->wwn_node = (u64)shmem_info.fcoe_wwn_node_name_upper |
-                        (((u64)shmem_info.fcoe_wwn_node_name_lower) << 32);
+       info->wwn_port = (u64)shmem_info.fcoe_wwn_port_name_lower |
+                        (((u64)shmem_info.fcoe_wwn_port_name_upper) << 32);
+       info->wwn_node = (u64)shmem_info.fcoe_wwn_node_name_lower |
+                        (((u64)shmem_info.fcoe_wwn_node_name_upper) << 32);
 
        info->ovlan = (u16)(shmem_info.ovlan_stag & FUNC_MF_CFG_OV_STAG_MASK);