From: "Luis R. Rodriguez" <[email protected]>

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 <[email protected]>
Signed-off-by: Hauke Mehrtens <[email protected]>
---
 backport/backport-include/linux/ethtool.h |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/backport/backport-include/linux/ethtool.h 
b/backport/backport-include/linux/ethtool.h
index 9ed268b..732a0db 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)
 {
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to