Fix compilation failure on Linux < 2.6.27 / CentOS 5

.github/workflows/issues.py

@@ -10,6 +10,8 @@
 on the situation.
 """
 
+from __future__ import print_function
+
 import functools
 import json
 import os

HISTORY.rst

@@ -1,5 +1,10 @@
 *Bug tracker at https://github.com/giampaolo/psutil/issues*
 
+5.9.5 (IN DEVELOPMENT)
+======================
+
+- 2164_, [Linux]: compilation fails on kernels < 2.6.27 (e.g. CentOS 5).
+
 5.9.4
 =====
 

psutil/__init__.py

@@ -211,7 +211,7 @@
 AF_LINK = _psplatform.AF_LINK
 
 __author__ = "Giampaolo Rodola'"
-__version__ = "5.9.4"
+__version__ = "5.9.5"
 version_info = tuple([int(num) for num in __version__.split('.')])
 
 _timer = getattr(time, 'monotonic', time.time)

psutil/_psutil_linux.c

@@ -78,10 +78,16 @@ ioprio_set(int which, int who, int ioprio) {
     return syscall(__NR_ioprio_set, which, who, ioprio);
 }
 
-// defined in linux/ethtool.h but not always available (e.g. Android)
+// * defined in linux/ethtool.h but not always available (e.g. Android)
+// * #ifdef check needed for old kernels, see:
+//   https://github.com/giampaolo/psutil/issues/2164
 static inline uint32_t
 psutil_ethtool_cmd_speed(const struct ethtool_cmd *ecmd) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
+    return ecmd->speed;
+#else
     return (ecmd->speed_hi << 16) | ecmd->speed;
+#endif
 }
 
 #define IOPRIO_CLASS_SHIFT 13

psutil/tests/test_windows.py

@@ -23,8 +23,8 @@
 import psutil
 from psutil import WINDOWS
 from psutil._compat import FileNotFoundError
-from psutil._compat import which
 from psutil._compat import super
+from psutil._compat import which
 from psutil.tests import APPVEYOR
 from psutil.tests import GITHUB_ACTIONS
 from psutil.tests import HAS_BATTERY