From 74ffff9036dce839e1f5e6835774126d29bd002f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 6 Sep 2012 19:06:57 +0100 Subject: ethtool-copy.h: sync with net-next This covers kernel changes up to: commit 6f6bbc186dc8e4e0c628db7decbd1a5e02cb5fd8 Author: Jesse Brandeburg Date: Thu Jul 26 02:30:53 2012 +0000 ethtool.h: MDI setting support Signed-off-by: Ben Hutchings --- ethtool-copy.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ethtool-copy.h b/ethtool-copy.h index 0e90e9b..4801eef 100644 --- a/ethtool-copy.h +++ b/ethtool-copy.h @@ -42,8 +42,10 @@ struct ethtool_cmd { * bits) in Mbps. Please use * ethtool_cmd_speed()/_set() to * access it */ - __u8 eth_tp_mdix; - __u8 reserved2; + __u8 eth_tp_mdix; /* twisted pair MDI-X status */ + __u8 eth_tp_mdix_ctrl; /* twisted pair MDI-X control, when set, + * link should be renegotiated if necessary + */ __u32 lp_advertising; /* Features the link partner advertises */ __u32 reserved[2]; }; @@ -989,10 +991,13 @@ enum ethtool_sfeatures_retval_bits { #define AUTONEG_DISABLE 0x00 #define AUTONEG_ENABLE 0x01 -/* Mode MDI or MDI-X */ -#define ETH_TP_MDI_INVALID 0x00 -#define ETH_TP_MDI 0x01 -#define ETH_TP_MDI_X 0x02 +/* MDI or MDI-X status/control - if MDI/MDI_X/AUTO is set then + * the driver is required to renegotiate link + */ +#define ETH_TP_MDI_INVALID 0x00 /* status: unknown; control: unsupported */ +#define ETH_TP_MDI 0x01 /* status: MDI; control: force MDI */ +#define ETH_TP_MDI_X 0x02 /* status: MDI-X; control: force MDI-X */ +#define ETH_TP_MDI_AUTO 0x03 /* control: auto-select */ /* Wake-On-Lan options. */ #define WAKE_PHY (1 << 0) -- cgit v1.2.1