Update to kernel commit 55f13311785c

Signed-off-by: Dan Murphy <[email protected]>
---
 uapi/linux/ethtool.h         |  2 ++
 uapi/linux/ethtool_netlink.h | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/uapi/linux/ethtool.h b/uapi/linux/ethtool.h
index 847ccd0b1fce..052689bcc90c 100644
--- a/uapi/linux/ethtool.h
+++ b/uapi/linux/ethtool.h
@@ -1615,6 +1615,8 @@ enum ethtool_link_mode_bit_indices {
        ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT = 87,
        ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT         = 88,
        ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT         = 89,
+       ETHTOOL_LINK_MODE_100baseFX_Half_BIT             = 90,
+       ETHTOOL_LINK_MODE_100baseFX_Full_BIT             = 91,
        /* must be last entry */
        __ETHTOOL_LINK_MODE_MASK_NBITS
 };
diff --git a/uapi/linux/ethtool_netlink.h b/uapi/linux/ethtool_netlink.h
index cebdb52e6a05..c022883cdb22 100644
--- a/uapi/linux/ethtool_netlink.h
+++ b/uapi/linux/ethtool_netlink.h
@@ -79,6 +79,7 @@ enum {
        ETHTOOL_MSG_TSINFO_GET_REPLY,
        ETHTOOL_MSG_CABLE_TEST_NTF,
        ETHTOOL_MSG_CABLE_TEST_TDR_NTF,
+       ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY,
 
        /* add new constants above here */
        __ETHTOOL_MSG_KERNEL_CNT,
@@ -91,9 +92,12 @@ enum {
 #define ETHTOOL_FLAG_COMPACT_BITSETS   (1 << 0)
 /* provide optional reply for SET or ACT requests */
 #define ETHTOOL_FLAG_OMIT_REPLY        (1 << 1)
+/* request statistics, if supported by the driver */
+#define ETHTOOL_FLAG_STATS             (1 << 2)
 
 #define ETHTOOL_FLAG_ALL (ETHTOOL_FLAG_COMPACT_BITSETS | \
-                         ETHTOOL_FLAG_OMIT_REPLY)
+                         ETHTOOL_FLAG_OMIT_REPLY | \
+                         ETHTOOL_FLAG_STATS)
 
 enum {
        ETHTOOL_A_HEADER_UNSPEC,
@@ -376,12 +380,25 @@ enum {
        ETHTOOL_A_PAUSE_AUTONEG,                        /* u8 */
        ETHTOOL_A_PAUSE_RX,                             /* u8 */
        ETHTOOL_A_PAUSE_TX,                             /* u8 */
+       ETHTOOL_A_PAUSE_STATS,                          /* nest - _PAUSE_STAT_* 
*/
 
        /* add new constants above here */
        __ETHTOOL_A_PAUSE_CNT,
        ETHTOOL_A_PAUSE_MAX = (__ETHTOOL_A_PAUSE_CNT - 1)
 };
 
+enum {
+       ETHTOOL_A_PAUSE_STAT_UNSPEC,
+       ETHTOOL_A_PAUSE_STAT_PAD,
+
+       ETHTOOL_A_PAUSE_STAT_TX_FRAMES,
+       ETHTOOL_A_PAUSE_STAT_RX_FRAMES,
+
+       /* add new constants above here */
+       __ETHTOOL_A_PAUSE_STAT_CNT,
+       ETHTOOL_A_PAUSE_STAT_MAX = (__ETHTOOL_A_PAUSE_STAT_CNT - 1)
+};
+
 /* EEE */
 
 enum {
-- 
2.28.0.585.ge1cfff676549

Reply via email to