summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-06-27 21:20:31 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2013-07-12 00:03:17 +0200
commit874207363818257860098b652a6df7f904de4ace (patch)
tree78a533cfc73de036ebd7e503ff94dc5f8bfdd2f4
parentb1bd4575484dd1c1ffe01ea300874cb4bfc8c877 (diff)
backports: add SPEED_UNKNOWN and DUPLEX_UNKNOWN
Upstream commit 8742a33b63428b13d21be4b79220813d2180752a This was added via uapi/linux/ethtool.h but using that file causes some odd issues I simply cannot resolve right now. I stuff these definitions into the regular include/linux/ethtool.h for now. This backports commit 589665f5 added via v3.2. mcgrof@frijol ~/linux-stable (git::master)$ git describe --contains \ 589665f5a6008dbce1d0af2cb93e94a80bf78151 v3.2-rc1~4^2~10 Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r--backport/backport-include/linux/ethtool.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/backport/backport-include/linux/ethtool.h b/backport/backport-include/linux/ethtool.h
index 9ed268b1..732a0db8 100644
--- a/backport/backport-include/linux/ethtool.h
+++ b/backport/backport-include/linux/ethtool.h
@@ -3,6 +3,14 @@
#include_next <linux/ethtool.h>
#include <linux/version.h>
+#ifndef SPEED_UNKNOWN
+#define SPEED_UNKNOWN -1
+#endif /* SPEED_UNKNOWN */
+
+#ifndef DUPLEX_UNKNOWN
+#define DUPLEX_UNKNOWN 0xff
+#endif /* DUPLEX_UNKNOWN */
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)
static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings)
{