[net-next-2.6 PATCH 1/1] e1000e: Expose MDI-X status via ethtool change

Chaitanya Lala
2009-05-22T17:19:58Z

Ethtool is a standard way of getting information about ethernet
interfaces. We enhance ethtool kernel interface & e1000e to make
the MDI-X status readable via ethtool in userspace.

Signed-off-by: Chaitanya Lala <clala@riverbed.com>
Signed-off-by: Arthur Jones <ajones@riverbed.com>
---
drivers/net/e1000e/ethtool.c | 8 ++++++++
include/linux/ethtool.h | 6 ++++++
2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c
index 4d25ede..8bbade1 100644
--- a/drivers/net/e1000e/ethtool.c
+++ b/drivers/net/e1000e/ethtool.c
@@ -167,6 +167,14 @@ static int e1000_get_settings(struct net_device *netdev,

ecmd->autoneg = ((hw->phy.media_type == e1000_media_type_fiber) ||
hw->mac.autoneg) ? AUTONEG_ENABLE : AUTONEG_DISABLE;
+
+ /* MDI-X => 2; MDI =>1; Invalid =>0 */
+ if ((hw->phy.media_type == e1000_media_type_copper) &&
+ !hw->mac.get_link_status)
+ ecmd->is_mdix = hw->phy.is_mdix ? MDI_X : MDI;
+ else
+ ecmd->is_mdix = MDI_INVALID;
+
return 0;
}

diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index 380b042..5211f59 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -33,6 +33,7 @@ struct ethtool_cmd {
__u16 reserved2;
__u32 lp_advertising; /* Features the link partner advertises */
__u32 reserved[2];
+ __u8 is_mdix; /* MDI-X status tri-state value */
};

static inline void ethtool_cmd_speed_set(struct ethtool_cmd *ep,
@@ -632,6 +633,11 @@ struct ethtool_ops {
#define AUTONEG_DISABLE 0x00
#define AUTONEG_ENABLE 0x01

+/* Mode MDI or MDI-X */
+#define MDI_INVALID 0x00
+#define MDI 0x01
+#define MDI_X 0x02
+
/* Wake-On-Lan options. */
#define WAKE_PHY (1 << 0)
#define WAKE_UCAST (1 << 1)
--
1.6.0.4