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

Commit 61a1fa10 authored by Yi Zou's avatar Yi Zou Committed by David S. Miller
Browse files

ixgbe: Add support for netdev_ops.ndo_fcoe_get_wwn to 82599 



Implements the netdev_ops.ndo_fcoe_get_wwn in 82599 if it finds valid
prefix for the World Wide Node Name (WWNN) or World Wide Port Name (WWPN),
as well as valid SAN MAC address.

Signed-off-by: default avatarYi Zou <yi.zou@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent df5c7945

drivers/net/ixgbe/ixgbe.h

+1 −0
Original line number Diff line number Diff line
@@ -457,6 +457,7 @@ extern int ixgbe_fcoe_disable(struct net_device *netdev); 
extern u8 ixgbe_fcoe_getapp(struct ixgbe_adapter *adapter);

extern u8 ixgbe_fcoe_setapp(struct ixgbe_adapter *adapter, u8 up);

#endif /* CONFIG_IXGBE_DCB */

extern int ixgbe_fcoe_get_wwn(struct net_device *netdev, u64 *wwn, int type);

#endif /* IXGBE_FCOE */



#endif /* _IXGBE_H_ */

drivers/net/ixgbe/ixgbe_fcoe.c

+46 −0
Original line number Diff line number Diff line
@@ -718,3 +718,49 @@ u8 ixgbe_fcoe_setapp(struct ixgbe_adapter *adapter, u8 up) 
	return 1;

}

#endif /* CONFIG_IXGBE_DCB */



/**

 * ixgbe_fcoe_get_wwn - get world wide name for the node or the port

 * @netdev : ixgbe adapter

 * @wwn : the world wide name

 * @type: the type of world wide name

 *

 * Returns the node or port world wide name if both the prefix and the san

 * mac address are valid, then the wwn is formed based on the NAA-2 for

 * IEEE Extended name identifier (ref. to T10 FC-LS Spec., Sec. 15.3).

 *

 * Returns : 0 on success

 */

int ixgbe_fcoe_get_wwn(struct net_device *netdev, u64 *wwn, int type)

{

	int rc = -EINVAL;

	u16 prefix = 0xffff;

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_mac_info *mac = &adapter->hw.mac;



	switch (type) {

	case NETDEV_FCOE_WWNN:

		prefix = mac->wwnn_prefix;

		break;

	case NETDEV_FCOE_WWPN:

		prefix = mac->wwpn_prefix;

		break;

	default:

		break;

	}



	if ((prefix != 0xffff) &&

	    is_valid_ether_addr(mac->san_addr)) {

		*wwn = ((u64) prefix << 48) |

		       ((u64) mac->san_addr[0] << 40) |

		       ((u64) mac->san_addr[1] << 32) |

		       ((u64) mac->san_addr[2] << 24) |

		       ((u64) mac->san_addr[3] << 16) |

		       ((u64) mac->san_addr[4] << 8)  |

		       ((u64) mac->san_addr[5]);

		rc = 0;

	}

	return rc;

}

drivers/net/ixgbe/ixgbe_main.c

+1 −0
Original line number Diff line number Diff line
@@ -5449,6 +5449,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { 
	.ndo_fcoe_ddp_done = ixgbe_fcoe_ddp_put,

	.ndo_fcoe_enable = ixgbe_fcoe_enable,

	.ndo_fcoe_disable = ixgbe_fcoe_disable,

	.ndo_fcoe_get_wwn = ixgbe_fcoe_get_wwn,

#endif /* IXGBE_FCOE */

};