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

Commit b262a9a7 authored by Usha Ketineni's avatar Usha Ketineni Committed by Jeff Kirsher
Browse files

ixgbe: Fix to get FDMI HBA attributes information with X550 



Check whether the FCOE support is enabled for the devices to get the
 FDMI HBA attributes information instead of checking each device id.
Also, add Model string information for X550.

Signed-off-by: default avatarUsha Ketineni <usha.k.ketineni@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d469251b

drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -996,8 +996,7 @@ int ixgbe_fcoe_get_hbainfo(struct net_device *netdev, 
		return -EINVAL;

		return -EINVAL;





	/* Don't return information on unsupported devices */

	/* Don't return information on unsupported devices */

	if (hw->mac.type != ixgbe_mac_82599EB &&

	if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))

	    hw->mac.type != ixgbe_mac_X540)

		return -EINVAL;

		return -EINVAL;





	/* Manufacturer */

	/* Manufacturer */
@@ -1043,6 +1042,10 @@ int ixgbe_fcoe_get_hbainfo(struct net_device *netdev, 
		snprintf(info->model,

		snprintf(info->model,

			 sizeof(info->model),

			 sizeof(info->model),

			 "Intel 82599");

			 "Intel 82599");

	} else if (hw->mac.type == ixgbe_mac_X550) {

		snprintf(info->model,

			 sizeof(info->model),

			 "Intel X550");

	} else {

	} else {

		snprintf(info->model,

		snprintf(info->model,

			 sizeof(info->model),

			 sizeof(info->model),