Merge branch 'master' of github.com:giampaolo/psutil

giampaolo · Oct 20, 2022 · 11c89d9 · 11c89d9
2 parents 57a7a70 + b0f780a
commit 11c89d9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/psutil/_psutil_posix.c b/psutil/_psutil_posix.c
@@ -708,13 +708,14 @@ int psutil_get_nic_speed(int ifm_active) {
                 case(IFM_1000_LX):  // 1000baseLX - single-mode fiber
                 case(IFM_1000_CX):  // 1000baseCX - 150ohm STP
 #if defined(IFM_1000_TX) && !defined(PSUTIL_OPENBSD)
+                #define HAS_CASE_IFM_1000_TX 1
                 // FreeBSD 4 and others (but NOT OpenBSD) -> #define IFM_1000_T in net/if_media.h
                 case(IFM_1000_TX):
 #endif
 #ifdef IFM_1000_FX
                 case(IFM_1000_FX):
 #endif
-#ifdef IFM_1000_T
+#if defined(IFM_1000_T) && (!HAS_CASE_IFM_1000_TX || IFM_1000_T != IFM_1000_TX)
                 case(IFM_1000_T):
 #endif
                     return 1000;