summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-18 10:13:32 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-11-18 16:14:21 +0100
commit64d9f7568bf8d3c500a9da5c93a2aa88084b901f (patch)
treeade7855e4370a421d04295eae9218f6b84dee2df
parent5dd101186bcb22ccf32d59f8ad4520e6c6006ed6 (diff)
downloadsystemd-64d9f7568bf8d3c500a9da5c93a2aa88084b901f.tar.gz
basic/missing: drop _ETHTOOL_LINK_MODE_MAX
It was only used in one place, where we don't actually need it, and it is too easy to forget to update it when adding new items to the table. Let's just drop it.
-rw-r--r--src/basic/missing.h7
-rw-r--r--src/udev/net/ethtool-util.c2
2 files changed, 1 insertions, 8 deletions
diff --git a/src/basic/missing.h b/src/basic/missing.h
index 85af7acdfe..45788af9e7 100644
--- a/src/basic/missing.h
+++ b/src/basic/missing.h
@@ -1577,11 +1577,4 @@ enum ethtool_link_mode_bit_indices {
#endif
#endif
-/* Strictly speaking, this is not a missing field. Just for our convention. */
-#if !HAVE_ETHTOOL_LINK_MODE_FEC_NONE_BIT
-#define _ETHTOOL_LINK_MODE_MAX 52
-#else
-#define _ETHTOOL_LINK_MODE_MAX (__ETHTOOL_LINK_MODE_LAST + 1)
-#endif
-
#include "missing_syscall.h"
diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
index 4cf6f269e3..177b273e48 100644
--- a/src/udev/net/ethtool-util.c
+++ b/src/udev/net/ethtool-util.c
@@ -56,7 +56,7 @@ static const char* const netdev_feature_table[_NET_DEV_FEAT_MAX] = {
[NET_DEV_FEAT_TSO6] = "tx-tcp6-segmentation",
};
-static const char* const ethtool_link_mode_bit_table[_ETHTOOL_LINK_MODE_MAX] = {
+static const char* const ethtool_link_mode_bit_table[] = {
[ETHTOOL_LINK_MODE_10baseT_Half_BIT] = "10baset-half",
[ETHTOOL_LINK_MODE_10baseT_Full_BIT] = "10baset-full",
[ETHTOOL_LINK_MODE_100baseT_Half_BIT] = "100baset-half",