Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d242e668 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

fcoe: Use default VLAN for FIP VLAN discovery 



FC-BB-6 states: FIP protocols shall be performed on a per-VLAN basis. It
is recommended to use the FIP VLAN discovery protocol on the default
VLAN.

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Acked-by: default avatarJohannes Thumshirn <jth@kernel.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b195d5e2

drivers/scsi/fcoe/fcoe.c

+48 −1
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ static struct fcoe_interface 


static int fcoe_fip_recv(struct sk_buff *, struct net_device *,

			 struct packet_type *, struct net_device *);

static int fcoe_fip_vlan_recv(struct sk_buff *, struct net_device *,

			      struct packet_type *, struct net_device *);



static void fcoe_fip_send(struct fcoe_ctlr *, struct sk_buff *);

static void fcoe_update_src_mac(struct fc_lport *, u8 *);
@@ -363,6 +365,12 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe, 
	fcoe->fip_packet_type.dev = netdev;

	dev_add_pack(&fcoe->fip_packet_type);



	if (netdev != real_dev) {

		fcoe->fip_vlan_packet_type.func = fcoe_fip_vlan_recv;

		fcoe->fip_vlan_packet_type.type = htons(ETH_P_FIP);

		fcoe->fip_vlan_packet_type.dev = real_dev;

		dev_add_pack(&fcoe->fip_vlan_packet_type);

	}

	return 0;

}
@@ -450,6 +458,8 @@ static void fcoe_interface_remove(struct fcoe_interface *fcoe) 
	 */

	__dev_remove_pack(&fcoe->fcoe_packet_type);

	__dev_remove_pack(&fcoe->fip_packet_type);

	if (netdev != fcoe->realdev)

		__dev_remove_pack(&fcoe->fip_vlan_packet_type);

	synchronize_net();



	/* Delete secondary MAC addresses */
@@ -519,6 +529,29 @@ static int fcoe_fip_recv(struct sk_buff *skb, struct net_device *netdev, 
	return 0;

}



/**

 * fcoe_fip_vlan_recv() - Handler for received FIP VLAN discovery frames

 * @skb:      The receive skb

 * @netdev:   The associated net device

 * @ptype:    The packet_type structure which was used to register this handler

 * @orig_dev: The original net_device the the skb was received on.

 *	      (in case dev is a bond)

 *

 * Returns: 0 for success

 */

static int fcoe_fip_vlan_recv(struct sk_buff *skb, struct net_device *netdev,

			      struct packet_type *ptype,

			      struct net_device *orig_dev)

{

	struct fcoe_interface *fcoe;

	struct fcoe_ctlr *ctlr;



	fcoe = container_of(ptype, struct fcoe_interface, fip_vlan_packet_type);

	ctlr = fcoe_to_ctlr(fcoe);

	fcoe_ctlr_recv(ctlr, skb);

	return 0;

}



/**

 * fcoe_port_send() - Send an Ethernet-encapsulated FIP/FCoE frame

 * @port: The FCoE port
@@ -539,7 +572,21 @@ static void fcoe_port_send(struct fcoe_port *port, struct sk_buff *skb) 
 */

static void fcoe_fip_send(struct fcoe_ctlr *fip, struct sk_buff *skb)

{

	skb->dev = fcoe_from_ctlr(fip)->netdev;

	struct fcoe_interface *fcoe = fcoe_from_ctlr(fip);

	struct fip_frame {

		struct ethhdr eth;

		struct fip_header fip;

	} __packed *frame;



	/*

	 * Use default VLAN for FIP VLAN discovery protocol

	 */

	frame = (struct fip_frame *)skb->data;

	if (frame->fip.fip_op == ntohs(FIP_OP_VLAN) &&

	    fcoe->realdev != fcoe->netdev)

		skb->dev = fcoe->realdev;

	else

		skb->dev = fcoe->netdev;

	fcoe_port_send(lport_priv(fip->lp), skb);

}

drivers/scsi/fcoe/fcoe.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct fcoe_interface { 
	struct net_device  *realdev;

	struct packet_type fcoe_packet_type;

	struct packet_type fip_packet_type;

	struct packet_type fip_vlan_packet_type;

	struct fc_exch_mgr *oem;

	u8	removed;

	u8	priority;