Merge Linus' tree to be be to apply submitted patches to newer code than

current trivial.git base

1 files changed, 29 insertions, 0 deletions

diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index e3c7a719c76b..99b43056a6fe 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -209,6 +209,33 @@ struct ethtool_value {
         __u32   data;
 };
 
+enum tunable_id {
+        ETHTOOL_ID_UNSPEC,
+        ETHTOOL_RX_COPYBREAK,
+        ETHTOOL_TX_COPYBREAK,
+};
+
+enum tunable_type_id {
+        ETHTOOL_TUNABLE_UNSPEC,
+        ETHTOOL_TUNABLE_U8,
+        ETHTOOL_TUNABLE_U16,
+        ETHTOOL_TUNABLE_U32,
+        ETHTOOL_TUNABLE_U64,
+        ETHTOOL_TUNABLE_STRING,
+        ETHTOOL_TUNABLE_S8,
+        ETHTOOL_TUNABLE_S16,
+        ETHTOOL_TUNABLE_S32,
+        ETHTOOL_TUNABLE_S64,
+};
+
+struct ethtool_tunable {
+        __u32   cmd;
+        __u32   id;
+        __u32   type_id;
+        __u32   len;
+        void    *data[0];
+};
+
 /**
  * struct ethtool_regs - hardware register dump
  * @cmd: Command number = %ETHTOOL_GREGS
@@ -1152,6 +1179,8 @@ enum ethtool_sfeatures_retval_bits {
 
 #define ETHTOOL_GRSSH           0x00000046 /* Get RX flow hash configuration */
 #define ETHTOOL_SRSSH           0x00000047 /* Set RX flow hash configuration */
+#define ETHTOOL_GTUNABLE        0x00000048 /* Get tunable configuration */
+#define ETHTOOL_STUNABLE        0x00000049 /* Set tunable configuration */
 
 /* compatibility with older code */
 #define SPARC_ETH_GSET          ETHTOOL_GSET