diff --git a/lib/libifconfig/libifconfig_sfp.c b/lib/libifconfig/libifconfig_sfp.c --- a/lib/libifconfig/libifconfig_sfp.c +++ b/lib/libifconfig/libifconfig_sfp.c @@ -24,6 +24,8 @@ * SUCH DAMAGE. */ +#define _WANT_SFF_8024_ID + #include #include #include diff --git a/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c b/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c --- a/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_diagnostics.c @@ -26,6 +26,8 @@ #include "opt_rss.h" #include "opt_ratelimit.h" +#define _WANT_SFF_8024_ID + #include #include #include diff --git a/sys/net/sff8472.h b/sys/net/sff8472.h --- a/sys/net/sff8472.h +++ b/sys/net/sff8472.h @@ -415,6 +415,7 @@ SFF_8024_ID_LAST = SFF_8024_ID_QSFP_CMIS }; +#if defined(_WANT_SFF_8024_ID) || defined(_WANT_SFF_8472_ID) static const char *sff_8024_id[SFF_8024_ID_LAST + 1] = { "Unknown", "GBIC", @@ -448,6 +449,7 @@ "x8MiniLink", "QSFP+(CIMS)" }; +#endif /* Keep compatibility with old definitions */ #define SFF_8472_ID_UNKNOWN SFF_8024_ID_UNKNOWN diff --git a/usr.sbin/cxgbetool/cxgbetool.c b/usr.sbin/cxgbetool/cxgbetool.c --- a/usr.sbin/cxgbetool/cxgbetool.c +++ b/usr.sbin/cxgbetool/cxgbetool.c @@ -25,6 +25,8 @@ * SUCH DAMAGE. */ +#define _WANT_SFF_8472_ID + #include #include #include