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 <h...@suse.com>
---
 drivers/scsi/fcoe/fcoe.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
index 9876fca..cf4adaa 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
-- 
1.8.5.6

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to