[SCSI] libfcoe: Support extra MAC descriptor to be used as FCoE MAC

Some switch implementations (eg., HP virtual connect FlexFabric) send two MAC
descriptors in FIP FLOGI response, with first MAC descriptor (granted_mac) used
as FPMA, and the second one (fcoe_mac) used as destination address for
sending/receiving FCoE packets. fip_mac continues to be used for FIP traffic.
This patch introduces fcoe_mac in fcoe_fcf structure. For regular switches,
both fcoe_mac and fip_mac will be the same. For the switches that send
additional MAC descriptor, fcoe_mac is updated.

Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/include/scsi/libfcoe.h b/include/scsi/libfcoe.h
index 5a35a2a2d3c5..cfdb55f0937e 100644
--- a/include/scsi/libfcoe.h
+++ b/include/scsi/libfcoe.h
@@ -165,7 +165,8 @@ struct fcoe_ctlr {
  * @switch_name: WWN of switch from advertisement
  * @fabric_name: WWN of fabric from advertisement
  * @fc_map:      FC_MAP value from advertisement
- * @fcf_mac:     Ethernet address of the FCF
+ * @fcf_mac:     Ethernet address of the FCF for FIP traffic
+ * @fcoe_mac:    Ethernet address of the FCF for FCoE traffic
  * @vfid:        virtual fabric ID
  * @pri:         selection priority, smaller values are better
  * @flogi_sent:  current FLOGI sent to this FCF
@@ -188,6 +189,7 @@ struct fcoe_fcf {
         u32 fc_map;
         u16 vfid;
         u8 fcf_mac[ETH_ALEN];
+        u8 fcoe_mac[ETH_ALEN];
 
         u8 pri;
         u8 flogi_sent;