From: Alan Brady <alan.brady@intel.com>
Date: Thu, 5 Oct 2017 14:53:32 -0700
Subject: i40e: remove ifdef SPEED_25000
Patch-mainline: v4.15-rc1
Git-commit: c6faca730dc01391e08011945fab5e67b09cdd05
References: bsc#1101816 FATE#325147 FATE#325149
This 'ifdef' doesn't accomplish anything so remove it.
Signed-off-by: Alan Brady <alan.brady@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 5 -----
1 file changed, 5 deletions(-)
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -531,12 +531,7 @@ static void i40e_get_settings_link_up(st
ks->base.speed = SPEED_40000;
break;
case I40E_LINK_SPEED_25GB:
-#ifdef SPEED_25000
ks->base.speed = SPEED_25000;
-#else
- netdev_info(netdev,
- "Speed is 25G, display not supported by this version of ethtool.\n");
-#endif
break;
case I40E_LINK_SPEED_20GB:
ks->base.speed = SPEED_20000;