Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next

[linux-2.6-microblaze.git] / include / uapi / linux / ethtool_netlink.h

diff --git a/include/uapi/linux/ethtool_netlink.h b/include/uapi/linux/ethtool_netlink.h
index 1711e57..4dda5e4 100644 (file)
--- a/include/uapi/linux/ethtool_netlink.h
+++ b/include/uapi/linux/ethtool_netlink.h
@@ -39,6 +39,8 @@ enum {
        ETHTOOL_MSG_EEE_GET,
        ETHTOOL_MSG_EEE_SET,
        ETHTOOL_MSG_TSINFO_GET,
+       ETHTOOL_MSG_CABLE_TEST_ACT,
+       ETHTOOL_MSG_CABLE_TEST_TDR_ACT,
 
        /* add new constants above here */
        __ETHTOOL_MSG_USER_CNT,
@@ -74,6 +76,8 @@ enum {
        ETHTOOL_MSG_EEE_GET_REPLY,
        ETHTOOL_MSG_EEE_NTF,
        ETHTOOL_MSG_TSINFO_GET_REPLY,
+       ETHTOOL_MSG_CABLE_TEST_NTF,
+       ETHTOOL_MSG_CABLE_TEST_TDR_NTF,
 
        /* add new constants above here */
        __ETHTOOL_MSG_KERNEL_CNT,
@@ -216,6 +220,8 @@ enum {
        ETHTOOL_A_LINKMODES_PEER,               /* bitset */
        ETHTOOL_A_LINKMODES_SPEED,              /* u32 */
        ETHTOOL_A_LINKMODES_DUPLEX,             /* u8 */
+       ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG,   /* u8 */
+       ETHTOOL_A_LINKMODES_MASTER_SLAVE_STATE, /* u8 */
 
        /* add new constants above here */
        __ETHTOOL_A_LINKMODES_CNT,
@@ -228,6 +234,8 @@ enum {
        ETHTOOL_A_LINKSTATE_UNSPEC,
        ETHTOOL_A_LINKSTATE_HEADER,             /* nest - _A_HEADER_* */
        ETHTOOL_A_LINKSTATE_LINK,               /* u8 */
+       ETHTOOL_A_LINKSTATE_SQI,                /* u32 */
+       ETHTOOL_A_LINKSTATE_SQI_MAX,            /* u32 */
 
        /* add new constants above here */
        __ETHTOOL_A_LINKSTATE_CNT,
@@ -403,6 +411,149 @@ enum {
        ETHTOOL_A_TSINFO_MAX = (__ETHTOOL_A_TSINFO_CNT - 1)
 };
 
+/* CABLE TEST */
+
+enum {
+       ETHTOOL_A_CABLE_TEST_UNSPEC,
+       ETHTOOL_A_CABLE_TEST_HEADER,            /* nest - _A_HEADER_* */
+
+       /* add new constants above here */
+       __ETHTOOL_A_CABLE_TEST_CNT,
+       ETHTOOL_A_CABLE_TEST_MAX = __ETHTOOL_A_CABLE_TEST_CNT - 1
+};
+
+/* CABLE TEST NOTIFY */
+enum {
+       ETHTOOL_A_CABLE_RESULT_CODE_UNSPEC,
+       ETHTOOL_A_CABLE_RESULT_CODE_OK,
+       ETHTOOL_A_CABLE_RESULT_CODE_OPEN,
+       ETHTOOL_A_CABLE_RESULT_CODE_SAME_SHORT,
+       ETHTOOL_A_CABLE_RESULT_CODE_CROSS_SHORT,
+};
+
+enum {
+       ETHTOOL_A_CABLE_PAIR_A,
+       ETHTOOL_A_CABLE_PAIR_B,
+       ETHTOOL_A_CABLE_PAIR_C,
+       ETHTOOL_A_CABLE_PAIR_D,
+};
+
+enum {
+       ETHTOOL_A_CABLE_RESULT_UNSPEC,
+       ETHTOOL_A_CABLE_RESULT_PAIR,            /* u8 ETHTOOL_A_CABLE_PAIR_ */
+       ETHTOOL_A_CABLE_RESULT_CODE,            /* u8 ETHTOOL_A_CABLE_RESULT_CODE_ */
+
+       __ETHTOOL_A_CABLE_RESULT_CNT,
+       ETHTOOL_A_CABLE_RESULT_MAX = (__ETHTOOL_A_CABLE_RESULT_CNT - 1)
+};
+
+enum {
+       ETHTOOL_A_CABLE_FAULT_LENGTH_UNSPEC,
+       ETHTOOL_A_CABLE_FAULT_LENGTH_PAIR,      /* u8 ETHTOOL_A_CABLE_PAIR_ */
+       ETHTOOL_A_CABLE_FAULT_LENGTH_CM,        /* u32 */
+
+       __ETHTOOL_A_CABLE_FAULT_LENGTH_CNT,
+       ETHTOOL_A_CABLE_FAULT_LENGTH_MAX = (__ETHTOOL_A_CABLE_FAULT_LENGTH_CNT - 1)
+};
+
+enum {
+       ETHTOOL_A_CABLE_TEST_NTF_STATUS_UNSPEC,
+       ETHTOOL_A_CABLE_TEST_NTF_STATUS_STARTED,
+       ETHTOOL_A_CABLE_TEST_NTF_STATUS_COMPLETED
+};
+
+enum {
+       ETHTOOL_A_CABLE_NEST_UNSPEC,
+       ETHTOOL_A_CABLE_NEST_RESULT,            /* nest - ETHTOOL_A_CABLE_RESULT_ */
+       ETHTOOL_A_CABLE_NEST_FAULT_LENGTH,      /* nest - ETHTOOL_A_CABLE_FAULT_LENGTH_ */
+       __ETHTOOL_A_CABLE_NEST_CNT,
+       ETHTOOL_A_CABLE_NEST_MAX = (__ETHTOOL_A_CABLE_NEST_CNT - 1)
+};
+
+enum {
+       ETHTOOL_A_CABLE_TEST_NTF_UNSPEC,
+       ETHTOOL_A_CABLE_TEST_NTF_HEADER,        /* nest - ETHTOOL_A_HEADER_* */
+       ETHTOOL_A_CABLE_TEST_NTF_STATUS,        /* u8 - _STARTED/_COMPLETE */
+       ETHTOOL_A_CABLE_TEST_NTF_NEST,          /* nest - of results: */
+
+       __ETHTOOL_A_CABLE_TEST_NTF_CNT,
+       ETHTOOL_A_CABLE_TEST_NTF_MAX = (__ETHTOOL_A_CABLE_TEST_NTF_CNT - 1)
+};
+
+/* CABLE TEST TDR */
+
+enum {
+       ETHTOOL_A_CABLE_TEST_TDR_CFG_UNSPEC,
+       ETHTOOL_A_CABLE_TEST_TDR_CFG_FIRST,             /* u32 */
+       ETHTOOL_A_CABLE_TEST_TDR_CFG_LAST,              /* u32 */
+       ETHTOOL_A_CABLE_TEST_TDR_CFG_STEP,              /* u32 */
+       ETHTOOL_A_CABLE_TEST_TDR_CFG_PAIR,              /* u8 */
+
+       /* add new constants above here */
+       __ETHTOOL_A_CABLE_TEST_TDR_CFG_CNT,
+       ETHTOOL_A_CABLE_TEST_TDR_CFG_MAX = __ETHTOOL_A_CABLE_TEST_TDR_CFG_CNT - 1
+};
+
+enum {
+       ETHTOOL_A_CABLE_TEST_TDR_UNSPEC,
+       ETHTOOL_A_CABLE_TEST_TDR_HEADER,        /* nest - _A_HEADER_* */
+       ETHTOOL_A_CABLE_TEST_TDR_CFG,           /* nest - *_TDR_CFG_* */
+
+       /* add new constants above here */
+       __ETHTOOL_A_CABLE_TEST_TDR_CNT,
+       ETHTOOL_A_CABLE_TEST_TDR_MAX = __ETHTOOL_A_CABLE_TEST_TDR_CNT - 1
+};
+
+/* CABLE TEST TDR NOTIFY */
+
+enum {
+       ETHTOOL_A_CABLE_AMPLITUDE_UNSPEC,
+       ETHTOOL_A_CABLE_AMPLITUDE_PAIR,         /* u8 */
+       ETHTOOL_A_CABLE_AMPLITUDE_mV,           /* s16 */
+
+       __ETHTOOL_A_CABLE_AMPLITUDE_CNT,
+       ETHTOOL_A_CABLE_AMPLITUDE_MAX = (__ETHTOOL_A_CABLE_AMPLITUDE_CNT - 1)
+};
+
+enum {
+       ETHTOOL_A_CABLE_PULSE_UNSPEC,
+       ETHTOOL_A_CABLE_PULSE_mV,               /* s16 */
+
+       __ETHTOOL_A_CABLE_PULSE_CNT,
+       ETHTOOL_A_CABLE_PULSE_MAX = (__ETHTOOL_A_CABLE_PULSE_CNT - 1)
+};
+
+enum {
+       ETHTOOL_A_CABLE_STEP_UNSPEC,
+       ETHTOOL_A_CABLE_STEP_FIRST_DISTANCE,    /* u32 */
+       ETHTOOL_A_CABLE_STEP_LAST_DISTANCE,     /* u32 */
+       ETHTOOL_A_CABLE_STEP_STEP_DISTANCE,     /* u32 */
+
+       __ETHTOOL_A_CABLE_STEP_CNT,
+       ETHTOOL_A_CABLE_STEP_MAX = (__ETHTOOL_A_CABLE_STEP_CNT - 1)
+};
+
+enum {
+       ETHTOOL_A_CABLE_TDR_NEST_UNSPEC,
+       ETHTOOL_A_CABLE_TDR_NEST_STEP,          /* nest - ETHTTOOL_A_CABLE_STEP */
+       ETHTOOL_A_CABLE_TDR_NEST_AMPLITUDE,     /* nest - ETHTOOL_A_CABLE_AMPLITUDE */
+       ETHTOOL_A_CABLE_TDR_NEST_PULSE,         /* nest - ETHTOOL_A_CABLE_PULSE */
+
+       __ETHTOOL_A_CABLE_TDR_NEST_CNT,
+       ETHTOOL_A_CABLE_TDR_NEST_MAX = (__ETHTOOL_A_CABLE_TDR_NEST_CNT - 1)
+};
+
+enum {
+       ETHTOOL_A_CABLE_TEST_TDR_NTF_UNSPEC,
+       ETHTOOL_A_CABLE_TEST_TDR_NTF_HEADER,    /* nest - ETHTOOL_A_HEADER_* */
+       ETHTOOL_A_CABLE_TEST_TDR_NTF_STATUS,    /* u8 - _STARTED/_COMPLETE */
+       ETHTOOL_A_CABLE_TEST_TDR_NTF_NEST,      /* nest - of results: */
+
+       /* add new constants above here */
+       __ETHTOOL_A_CABLE_TEST_TDR_NTF_CNT,
+       ETHTOOL_A_CABLE_TEST_TDR_NTF_MAX = __ETHTOOL_A_CABLE_TEST_TDR_NTF_CNT - 1
+};
+
 /* generic netlink info */
 #define ETHTOOL_GENL_NAME "ethtool"
 #define ETHTOOL_GENL_VERSION 1