|
@@ -45,8 +45,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];
|
|
|
};
|
|
@@ -1229,10 +1231,13 @@ struct ethtool_ops {
|
|
|
#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)
|