summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-06-27 21:20:31 +0000
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-07-01 13:41:50 -0700
commit8742a33b63428b13d21be4b79220813d2180752a (patch)
tree31e6f804f5b91867160c32d8a2bd1c8d8e8b0304
parentafe18ac2454e8ba8c3a45a837da7c7fca65c5aae (diff)
backports: add SPEED_UNKNOWN and DUPLEX_UNKNOWNbackports-20130618
This gets us in synch with next-20130618. 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 commit 589665f5a6008dbce1d0af2cb93e94a80bf78151 Author: Dan Carpenter <dan.carpenter@oracle.com> Date: Fri Nov 4 08:21:38 2011 +0000 bonding: comparing a u8 with -1 is always false slave->duplex is a u8 type so the in bond_info_show_slave() when we check "if (slave->duplex == -1)", it's always false. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net> 1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ] real 15m7.262s user 335m33.818s sys 82m36.486s 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 0c1eee67..2f323b01 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)
#define ethtool_rxfh_indir_default LINUX_BACKPORT(ethtool_rxfh_indir_default)
static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings)