qed: Correct order of wwnn and wwpn

Orabug: 26783820

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>
[ Upstream commit 5779675912fa87d8d0af651537acc0e312f06c70 ]
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_mcp.c b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
index beef725373567516549230718d022e55e70e72cc..207fd4b22761e2da174131c68968dab409934f35 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_mcp.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_mcp.c
@@ -1732,10 +1732,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);