[SCSI] libfcoe: fix VN2VN N_Port_ID Beacon source MAC
authorYi Zou <yi.zou@intel.com>
Fri, 20 Apr 2012 19:16:49 +0000 (12:16 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Thu, 10 May 2012 07:59:26 +0000 (08:59 +0100)
FC-BB-6 v1.04 7.9.8.14 N_Port_ID Beacon:

"A N_Port_ID Beacon is multicast and uses the VN_Port MAC address as source
address."

Currently, libfcoe is using ENode MAC, this seems ok and functionality wise
not a problem in my back to back testing setup, however, just fix this to
make libfcoe VN2VN support more spec compliant.

Signed-off-by: Yi Zou <yi.zou@intel.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/fcoe/fcoe_ctlr.c

index 249a106888d9309ab44ff0f4d2cc82d1b0ff2dc8..5a4c7250aa77abd218ea52c65da31fb514abfd30 100644 (file)
@@ -1883,7 +1883,13 @@ static void fcoe_ctlr_vn_send(struct fcoe_ctlr *fip,
        frame = (struct fip_frame *)skb->data;
        memset(frame, 0, len);
        memcpy(frame->eth.h_dest, dest, ETH_ALEN);
-       memcpy(frame->eth.h_source, fip->ctl_src_addr, ETH_ALEN);
+
+       if (sub == FIP_SC_VN_BEACON) {
+               hton24(frame->eth.h_source, FIP_VN_FC_MAP);
+               hton24(frame->eth.h_source + 3, fip->port_id);
+       } else {
+               memcpy(frame->eth.h_source, fip->ctl_src_addr, ETH_ALEN);
+       }
        frame->eth.h_proto = htons(ETH_P_FIP);
 
        frame->fip.fip_ver = FIP_VER_ENCAPS(FIP_VER);