Update kernel headers

Update kernel headers to commit:
    cd556e40fdf3 ("devlink: expand the devlink-info documentation")

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 5dffabafb056b904514596d54bfe08314e359944..cb581cc03a41215804a5d06edffaaae9cc7f8f8f 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -131,7 +131,6 @@ enum {
 #define BRIDGE_VLAN_INFO_RANGE_END     (1<<4) /* VLAN is end of vlan range */
 #define BRIDGE_VLAN_INFO_BRENTRY       (1<<5) /* Global bridge VLAN entry */
 #define BRIDGE_VLAN_INFO_ONLY_OPTS     (1<<6) /* Skip create/delete/flags */
-#define BRIDGE_VLAN_INFO_REMOVE_TUN    (1<<7) /* Remove tunnel mapping */
 
 struct bridge_vlan_info {
        __u16 flags;
@@ -203,12 +202,27 @@ enum {
        BRIDGE_VLANDB_ENTRY_INFO,
        BRIDGE_VLANDB_ENTRY_RANGE,
        BRIDGE_VLANDB_ENTRY_STATE,
-       BRIDGE_VLANDB_ENTRY_TUNNEL_ID,
+       BRIDGE_VLANDB_ENTRY_TUNNEL_INFO,
        BRIDGE_VLANDB_ENTRY_STATS,
        __BRIDGE_VLANDB_ENTRY_MAX,
 };
 #define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1)
 
+/* [BRIDGE_VLANDB_ENTRY] = {
+ *     [BRIDGE_VLANDB_ENTRY_TUNNEL_INFO] = {
+ *         [BRIDGE_VLANDB_TINFO_ID]
+ *         ...
+ *     }
+ * }
+ */
+enum {
+       BRIDGE_VLANDB_TINFO_UNSPEC,
+       BRIDGE_VLANDB_TINFO_ID,
+       BRIDGE_VLANDB_TINFO_CMD,
+       __BRIDGE_VLANDB_TINFO_MAX,
+};
+#define BRIDGE_VLANDB_TINFO_MAX (__BRIDGE_VLANDB_TINFO_MAX - 1)
+
 /* [BRIDGE_VLANDB_ENTRY] = {
  *     [BRIDGE_VLANDB_ENTRY_STATS] = {
  *         [BRIDGE_VLANDB_STATS_RX_BYTES]

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 81cc1a8695884d9f4534cef0af51b0cce87cd4bc..6fcf7307e5342a3f8021ef2a3b7e37b9578ec2c2 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -17,7 +17,7 @@ enum {
        TCA_ACT_PAD,
        TCA_ACT_COOKIE,
        TCA_ACT_FLAGS,
-       TCA_ACT_HW_STATS_TYPE,
+       TCA_ACT_HW_STATS,
        __TCA_ACT_MAX
 };
 
@@ -31,20 +31,19 @@ enum {
  * all supported bits set.
  * In case no bits are set, user is not interested in getting any HW statistics.
  */
-#define TCA_ACT_HW_STATS_TYPE_IMMEDIATE (1 << 0) /* Means that in dump, user
-                                                 * gets the current HW stats
-                                                 * state from the device
-                                                 * queried at the dump time.
-                                                 */
-#define TCA_ACT_HW_STATS_TYPE_DELAYED (1 << 1) /* Means that in dump, user gets
-                                               * HW stats that might be out
-                                               * of date for some time, maybe
-                                               * couple of seconds. This is
-                                               * the case when driver polls
-                                               * stats updates periodically
-                                               * or when it gets async stats update
-                                               * from the device.
-                                               */
+#define TCA_ACT_HW_STATS_IMMEDIATE (1 << 0) /* Means that in dump, user
+                                            * gets the current HW stats
+                                            * state from the device
+                                            * queried at the dump time.
+                                            */
+#define TCA_ACT_HW_STATS_DELAYED (1 << 1) /* Means that in dump, user gets
+                                          * HW stats that might be out of date
+                                          * for some time, maybe couple of
+                                          * seconds. This is the case when
+                                          * driver polls stats updates
+                                          * periodically or when it gets async
+                                          * stats update from the device.
+                                          */
 
 #define TCA_ACT_MAX __TCA_ACT_MAX
 #define TCA_OLD_COMPAT (TCA_ACT_MAX+1)