Update kernel headers

Update kernel headers to commit:
    748d1c8a425e ("Merge branch 'devlink-Use-nla_policy-to-validate-range'")

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

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index b7f23faae9015b77914d5ae5742283fa20855295..a08c84cb1f9a0bf711e1771bcafe74ef2b2c6a24 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -122,6 +122,8 @@ enum devlink_command {
        DEVLINK_CMD_TRAP_POLICER_NEW,
        DEVLINK_CMD_TRAP_POLICER_DEL,
 
+       DEVLINK_CMD_HEALTH_REPORTER_TEST,
+
        /* add new commands above here */
        __DEVLINK_CMD_MAX,
        DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
@@ -458,6 +460,11 @@ enum devlink_attr {
        DEVLINK_ATTR_PORT_LANES,                        /* u32 */
        DEVLINK_ATTR_PORT_SPLITTABLE,                   /* u8 */
 
+       DEVLINK_ATTR_PORT_EXTERNAL,             /* u8 */
+       DEVLINK_ATTR_PORT_CONTROLLER_NUMBER,    /* u32 */
+
+       DEVLINK_ATTR_FLASH_UPDATE_STATUS_TIMEOUT,       /* u64 */
+
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 9d96890f9742fb665de47ab30a1750c5c53b7c2a..307e5c245e9fe3374d15c0bbf7030caa5e22580d 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -7,24 +7,23 @@
 
 /* This struct should be in sync with struct rtnl_link_stats64 */
 struct rtnl_link_stats {
-       __u32   rx_packets;             /* total packets received       */
-       __u32   tx_packets;             /* total packets transmitted    */
-       __u32   rx_bytes;               /* total bytes received         */
-       __u32   tx_bytes;               /* total bytes transmitted      */
-       __u32   rx_errors;              /* bad packets received         */
-       __u32   tx_errors;              /* packet transmit problems     */
-       __u32   rx_dropped;             /* no space in linux buffers    */
-       __u32   tx_dropped;             /* no space available in linux  */
-       __u32   multicast;              /* multicast packets received   */
+       __u32   rx_packets;
+       __u32   tx_packets;
+       __u32   rx_bytes;
+       __u32   tx_bytes;
+       __u32   rx_errors;
+       __u32   tx_errors;
+       __u32   rx_dropped;
+       __u32   tx_dropped;
+       __u32   multicast;
        __u32   collisions;
-
        /* detailed rx_errors: */
        __u32   rx_length_errors;
-       __u32   rx_over_errors;         /* receiver ring buff overflow  */
-       __u32   rx_crc_errors;          /* recved pkt with crc error    */
-       __u32   rx_frame_errors;        /* recv'd frame alignment error */
-       __u32   rx_fifo_errors;         /* recv'r fifo overrun          */
-       __u32   rx_missed_errors;       /* receiver missed packet       */
+       __u32   rx_over_errors;
+       __u32   rx_crc_errors;
+       __u32   rx_frame_errors;
+       __u32   rx_fifo_errors;
+       __u32   rx_missed_errors;
 
        /* detailed tx_errors */
        __u32   tx_aborted_errors;
@@ -37,7 +36,7 @@ struct rtnl_link_stats {
        __u32   rx_compressed;
        __u32   tx_compressed;
 
-       __u32   rx_nohandler;           /* dropped, no handler found    */
+       __u32   rx_nohandler;
 };
 
 /**

diff --git a/include/uapi/linux/tipc.h b/include/uapi/linux/tipc.h
index de5bcd2a09fae1c0c9be8c138be140e6d03d2528..f08cc366374c5de978c56778208e7350145f5471 100644 (file)
--- a/include/uapi/linux/tipc.h
+++ b/include/uapi/linux/tipc.h
@@ -254,6 +254,8 @@ static __inline__ int tipc_aead_key_size(struct tipc_aead_key *key)
        return sizeof(*key) + key->keylen;
 }
 
+#define TIPC_REKEYING_NOW              (~0U)
+
 /* The macros and functions below are deprecated:
  */
 

diff --git a/include/uapi/linux/tipc_netlink.h b/include/uapi/linux/tipc_netlink.h
index dc0d23a50e69e8cfb58ab652fe52aa1372be89e7..d847dd671d79c29c6ebdab0cb8f0140401b689b2 100644 (file)
--- a/include/uapi/linux/tipc_netlink.h
+++ b/include/uapi/linux/tipc_netlink.h
@@ -165,6 +165,8 @@ enum {
        TIPC_NLA_NODE_UP,               /* flag */
        TIPC_NLA_NODE_ID,               /* data */
        TIPC_NLA_NODE_KEY,              /* data */
+       TIPC_NLA_NODE_KEY_MASTER,       /* flag */
+       TIPC_NLA_NODE_REKEYING,         /* u32 */
 
        __TIPC_NLA_NODE_MAX,
        TIPC_NLA_NODE_MAX = __TIPC_NLA_NODE_MAX - 1