From: Hannes Reinecke Date: Thu, 13 Oct 2016 13:10:59 +0000 (+0200) Subject: scsi: fcoe: correct sending FIP VLAN packets on VLAN 0 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f7e6ed0654128979a1939be6640416abb6a54811;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git scsi: fcoe: correct sending FIP VLAN packets on VLAN 0 The FIP VLAN frame consists of an ethernet header followed by the FIP VLAN frame, so we need to skip the ethernet header if we want to check the FIP opcode. Signed-off-by: Hannes Reinecke Reviewed-by: Bart Van Assche Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 9876fca8946a..cf4adaafd668 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c @@ -590,7 +590,8 @@ static void fcoe_fip_send(struct fcoe_ctlr *fip, struct sk_buff *skb) * Use default VLAN for FIP VLAN discovery protocol */ frame = (struct fip_frame *)skb->data; - if (frame->fip.fip_op == ntohs(FIP_OP_VLAN) && + if (ntohs(frame->eth.h_proto) == ETH_P_FIP && + ntohs(frame->fip.fip_op) == FIP_OP_VLAN && fcoe->realdev != fcoe->netdev) skb->dev = fcoe->realdev; else