diff options
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index 9c1211ad2c6b..311edac272aa 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c | |||
| @@ -4660,14 +4660,15 @@ flags_complete: | |||
| 4660 | return -EOPNOTSUPP; | 4660 | return -EOPNOTSUPP; |
| 4661 | 4661 | ||
| 4662 | /* If the driver detected FW LLDP was disabled on init, this flag could | 4662 | /* If the driver detected FW LLDP was disabled on init, this flag could |
| 4663 | * be set, however we do not support _changing_ the flag if NPAR is | 4663 | * be set, however we do not support _changing_ the flag: |
| 4664 | * enabled or FW API version < 1.7. There are situations where older | 4664 | * - on XL710 if NPAR is enabled or FW API version < 1.7 |
| 4665 | * FW versions/NPAR enabled PFs could disable LLDP, however we _must_ | 4665 | * - on X722 with FW API version < 1.6 |
| 4666 | * not allow the user to enable/disable LLDP with this flag on | 4666 | * There are situations where older FW versions/NPAR enabled PFs could |
| 4667 | * unsupported FW versions. | 4667 | * disable LLDP, however we _must_ not allow the user to enable/disable |
| 4668 | * LLDP with this flag on unsupported FW versions. | ||
| 4668 | */ | 4669 | */ |
| 4669 | if (changed_flags & I40E_FLAG_DISABLE_FW_LLDP) { | 4670 | if (changed_flags & I40E_FLAG_DISABLE_FW_LLDP) { |
| 4670 | if (!(pf->hw_features & I40E_HW_STOPPABLE_FW_LLDP)) { | 4671 | if (!(pf->hw.flags & I40E_HW_FLAG_FW_LLDP_STOPPABLE)) { |
| 4671 | dev_warn(&pf->pdev->dev, | 4672 | dev_warn(&pf->pdev->dev, |
| 4672 | "Device does not support changing FW LLDP\n"); | 4673 | "Device does not support changing FW LLDP\n"); |
| 4673 | return -EOPNOTSUPP; | 4674 | return -EOPNOTSUPP; |