ixgbe: Fix to get FDMI HBA attributes information with X550

Orabug: 23177316

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: Usha Ketineni <usha.k.ketineni@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit b262a9a772eae649159fd2480992713a2dd2b3d3)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
index 598293790ae612db88728d473494ba1360b86b8a..df1647fa892aa585194a00fa2b7b4e36ac5164bb 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
@@ -996,8 +996,7 @@ int ixgbe_fcoe_get_hbainfo(struct net_device *netdev,
                return -EINVAL;
 
        /* Don't return information on unsupported devices */
-       if (hw->mac.type != ixgbe_mac_82599EB &&
-           hw->mac.type != ixgbe_mac_X540)
+       if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED))
                return -EINVAL;
 
        /* Manufacturer */
@@ -1043,6 +1042,10 @@ int ixgbe_fcoe_get_hbainfo(struct net_device *netdev,
                snprintf(info->model,
                         sizeof(info->model),
                         "Intel 82599");
+       } else if (hw->mac.type == ixgbe_mac_X550) {
+               snprintf(info->model,
+                        sizeof(info->model),
+                        "Intel X550");
        } else {
                snprintf(info->model,
                         sizeof(info->model),