commit e93e4a0e35e29de2dcd92ec34c33e5290f77f21f
author William A. Kennington III <wak@google.com> Tue Oct 11 16:06:17 2022 -0700
committer William A. Kennington III <wak@google.com> Tue Oct 25 03:24:38 2022 -0700
tree ea2275dfab6e0835c9ec0978fee3fa268b375c73
parent 6a113474e9045f96aadf50129d2dfe6b68d09e09

ethernet_interface: Always try ethtool as we handle unsupported

Change-Id: I5f2e5964f309094b81c1541ba47d4bf9743fa252
Signed-off-by: William A. Kennington III <wak@google.com>

meson.build

diff --git a/meson.build b/meson.build
index 36b00f6..d0ac5ce 100644
--- a/meson.build
+++ b/meson.build
@@ -19,7 +19,6 @@
 conf_data.set(
   'ENABLE_IPV6_ACCEPT_RA',
   get_option('default-ipv6-accept-ra'))
-conf_data.set('NIC_SUPPORTS_ETHTOOL', get_option('nic-ethtool'))
 conf_data.set('SYNC_MAC_FROM_INVENTORY', get_option('sync-mac'))
 conf_data.set('PERSIST_MAC', get_option('persist-mac'))
 

meson_options.txt

diff --git a/meson_options.txt b/meson_options.txt
index 59d20f4..83862af 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,8 +6,6 @@
        description: 'Enable link local autoconfiguration by default')
 option('default-ipv6-accept-ra', type: 'boolean',
        description: 'Accept router advertisements by default')
-option('nic-ethtool', type: 'boolean',
-       description: 'Enable ethtool information lookup')
 option('sync-mac', type: 'boolean',
        description: 'Sync mac address with phosphor-inventory-manager')
 option('hyp-nw-config', type : 'boolean',

src/ethernet_interface.cpp

diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp
index b891401..c0f3a36 100644
--- a/src/ethernet_interface.cpp
+++ b/src/ethernet_interface.cpp
@@ -107,12 +107,9 @@
     EthernetInterfaceIntf::linkUp(linkUp());
     EthernetInterfaceIntf::mtu(mtu());
 
-#ifdef NIC_SUPPORTS_ETHTOOL
     InterfaceInfo ifInfo = EthernetInterface::getInterfaceInfo();
-
     EthernetInterfaceIntf::autoNeg(std::get<2>(ifInfo));
     EthernetInterfaceIntf::speed(std::get<0>(ifInfo));
-#endif
 
     // Emit deferred signal.
     if (emitSignal)
@@ -314,13 +311,6 @@
     return objectPath;
 }
 
-#ifdef NIC_SUPPORTS_ETHTOOL
-/*
-  Enable this code if your NIC driver supports the ETHTOOL features.
-  Do this by adding the following to your phosphor-network*.bbappend file.
-     EXTRA_OECONF_append = " --enable-nic-ethtool=yes"
-  The default compile mode is to omit getInterfaceInfo()
-*/
 InterfaceInfo EthernetInterface::getInterfaceInfo() const
 {
     ifreq ifr = {};
@@ -353,7 +343,6 @@
 
     return std::make_tuple(speed, duplex, autoneg, linkState, enabled, mtuSize);
 }
-#endif
 
 /** @brief get the mac address of the interface.
  *  @return macaddress on success