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

Commit 5bab87e6 authored by Yi Zou's avatar Yi Zou Committed by James Bottomley
Browse files

[SCSI] fcoe: Fix getting san mac for VLAN interface 



Make sure we are get the SAN MAC address from the real netdev if the input
netdev is a VLAN device.

Signed-off-by: default avatarYi Zou <yi.zou@intel.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent bf361707

drivers/scsi/fcoe/fcoe.c

+4 −1
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe, 
{

	struct fcoe_ctlr *fip = &fcoe->ctlr;

	struct netdev_hw_addr *ha;

	struct net_device *real_dev;

	u8 flogi_maddr[ETH_ALEN];

	const struct net_device_ops *ops;
@@ -272,8 +273,10 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe, 


	/* look for SAN MAC address, if multiple SAN MACs exist, only

	 * use the first one for SPMA */

	real_dev = (netdev->priv_flags & IFF_802_1Q_VLAN) ?

		vlan_dev_real_dev(netdev) : netdev;

	rcu_read_lock();

	for_each_dev_addr(netdev, ha) {

	for_each_dev_addr(real_dev, ha) {

		if ((ha->type == NETDEV_HW_ADDR_T_SAN) &&

		    (is_valid_ether_addr(ha->addr))) {

			memcpy(fip->ctl_src_addr, ha->addr, ETH_ALEN);