Update kernel headers

Update kernel headers to commit:
    aa2eaa8c272a ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 79701d3e66f0b9fe1fca25d9cdd648a03ca198b0..f7a7553005ab2cc48468d3bdf52399673e55dfb6 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -106,6 +106,7 @@ enum bpf_cmd {
        BPF_TASK_FD_QUERY,
        BPF_MAP_LOOKUP_AND_DELETE_ELEM,
        BPF_MAP_FREEZE,
+       BPF_BTF_GET_NEXT_ID,
 };
 
 enum bpf_map_type {
@@ -284,6 +285,9 @@ enum bpf_attach_type {
  */
 #define BPF_F_TEST_RND_HI32    (1U << 2)
 
+/* The verifier internal test flag. Behavior is undefined */
+#define BPF_F_TEST_STATE_FREQ  (1U << 3)
+
 /* When BPF ldimm64's insn[0].src_reg != 0 then this can have
  * two extensions:
  *
@@ -337,6 +341,9 @@ enum bpf_attach_type {
 #define BPF_F_RDONLY_PROG      (1U << 7)
 #define BPF_F_WRONLY_PROG      (1U << 8)
 
+/* Clone map from listener for newly accepted socket */
+#define BPF_F_CLONE            (1U << 9)
+
 /* flags for BPF_PROG_QUERY */
 #define BPF_F_QUERY_EFFECTIVE  (1U << 0)
 
@@ -576,6 +583,8 @@ union bpf_attr {
  *             limited to five).
  *
  *             Each time the helper is called, it appends a line to the trace.
+ *             Lines are discarded while *\/sys/kernel/debug/tracing/trace* is
+ *             open, use *\/sys/kernel/debug/tracing/trace_pipe* to avoid this.
  *             The format of the trace is customizable, and the exact output
  *             one will get depends on the options set in
  *             *\/sys/kernel/debug/tracing/trace_options* (see also the
@@ -1014,7 +1023,7 @@ union bpf_attr {
  *             The realm of the route for the packet associated to *skb*, or 0
  *             if none was found.
  *
- * int bpf_perf_event_output(struct pt_reg *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
+ * int bpf_perf_event_output(struct pt_regs *ctx, struct bpf_map *map, u64 flags, void *data, u64 size)
  *     Description
  *             Write raw *data* blob into a special BPF perf event held by
  *             *map* of type **BPF_MAP_TYPE_PERF_EVENT_ARRAY**. This perf
@@ -1076,7 +1085,7 @@ union bpf_attr {
  *     Return
  *             0 on success, or a negative error in case of failure.
  *
- * int bpf_get_stackid(struct pt_reg *ctx, struct bpf_map *map, u64 flags)
+ * int bpf_get_stackid(struct pt_regs *ctx, struct bpf_map *map, u64 flags)
  *     Description
  *             Walk a user or a kernel stack and return its id. To achieve
  *             this, the helper needs *ctx*, which is a pointer to the context
@@ -1725,7 +1734,7 @@ union bpf_attr {
  *     Return
  *             0 on success, or a negative error in case of failure.
  *
- * int bpf_override_return(struct pt_reg *regs, u64 rc)
+ * int bpf_override_return(struct pt_regs *regs, u64 rc)
  *     Description
  *             Used for error injection, this helper uses kprobes to override
  *             the return value of the probed function, and to set it to *rc*.

diff --git a/include/uapi/linux/can.h b/include/uapi/linux/can.h
index 9009f0b6505cf3a0fd604c80e35b8b70332e0c62..c61cdc7ad5cc67cedaae8348b3440b1b185bb911 100644 (file)
--- a/include/uapi/linux/can.h
+++ b/include/uapi/linux/can.h
@@ -157,7 +157,8 @@ struct canfd_frame {
 #define CAN_TP20       4 /* VAG Transport Protocol v2.0 */
 #define CAN_MCNET      5 /* Bosch MCNet */
 #define CAN_ISOTP      6 /* ISO 15765-2 Transport Protocol */
-#define CAN_NPROTO     7
+#define CAN_J1939      7 /* SAE J1939 */
+#define CAN_NPROTO     8
 
 #define SOL_CAN_BASE 100
 
@@ -174,6 +175,23 @@ struct sockaddr_can {
                /* transport protocol class address information (e.g. ISOTP) */
                struct { canid_t rx_id, tx_id; } tp;
 
+               /* J1939 address information */
+               struct {
+                       /* 8 byte name when using dynamic addressing */
+                       __u64 name;
+
+                       /* pgn:
+                        * 8 bit: PS in PDU2 case, else 0
+                        * 8 bit: PF
+                        * 1 bit: DP
+                        * 1 bit: reserved
+                        */
+                       __u32 pgn;
+
+                       /* 1 byte address */
+                       __u8 addr;
+               } j1939;
+
                /* reserved for future CAN protocols address information */
        } can_addr;
 };

diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 3fb683bee6ba16df7aeb9687e134c74c3551fdcc..79e1405db67cc76d6a21bafd37bbdfa199c50773 100644 (file)
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -202,6 +202,15 @@ enum devlink_param_cmode {
 enum devlink_param_fw_load_policy_value {
        DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DRIVER,
        DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_FLASH,
+       DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_DISK,
+       DEVLINK_PARAM_FW_LOAD_POLICY_VALUE_UNKNOWN,
+};
+
+enum devlink_param_reset_dev_on_drv_probe_value {
+       DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_UNKNOWN,
+       DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_ALWAYS,
+       DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_NEVER,
+       DEVLINK_PARAM_RESET_DEV_ON_DRV_PROBE_VALUE_DISK,
 };
 
 enum {
@@ -410,6 +419,8 @@ enum devlink_attr {
        DEVLINK_ATTR_TRAP_METADATA,                     /* nested */
        DEVLINK_ATTR_TRAP_GROUP_NAME,                   /* string */
 
+       DEVLINK_ATTR_RELOAD_FAILED,                     /* u8 0 or 1 */
+
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,

diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h
index f3bcd7ee82771fc8a775c7a69a679ece4ff0008f..3dff6841486a4309fdae94fe2673f3211e73ed2c 100644 (file)
--- a/include/uapi/linux/inet_diag.h
+++ b/include/uapi/linux/inet_diag.h
@@ -153,11 +153,20 @@ enum {
        INET_DIAG_BBRINFO,      /* request as INET_DIAG_VEGASINFO */
        INET_DIAG_CLASS_ID,     /* request as INET_DIAG_TCLASS */
        INET_DIAG_MD5SIG,
+       INET_DIAG_ULP_INFO,
        __INET_DIAG_MAX,
 };
 
 #define INET_DIAG_MAX (__INET_DIAG_MAX - 1)
 
+enum {
+       INET_ULP_INFO_UNSPEC,
+       INET_ULP_INFO_NAME,
+       INET_ULP_INFO_TLS,
+       __INET_ULP_INFO_MAX,
+};
+#define INET_ULP_INFO_MAX (__INET_ULP_INFO_MAX - 1)
+
 /* INET_DIAG_MEM */
 
 struct inet_diag_meminfo {

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index b057aeeb63386442d0e1e8d91321adddc69b4e79..a6aa466fac9e85b2acde80d21ff1e00db89169f6 100644 (file)
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -160,6 +160,8 @@ enum {
        TCA_POLICE_RESULT,
        TCA_POLICE_TM,
        TCA_POLICE_PAD,
+       TCA_POLICE_RATE64,
+       TCA_POLICE_PEAKRATE64,
        __TCA_POLICE_MAX
 #define TCA_POLICE_RESULT TCA_POLICE_RESULT
 };

diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index c4bce0a2011c15c85f518bb44755c9af6788ee39..0d4c1507a169da28065ef5e9ef6edcc2a4101a42 100644 (file)
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -134,6 +134,9 @@ typedef __s32 sctp_assoc_t;
 #define SCTP_INTERLEAVING_SUPPORTED    125
 #define SCTP_SENDMSG_CONNECT   126
 #define SCTP_EVENT     127
+#define SCTP_ASCONF_SUPPORTED  128
+#define SCTP_AUTH_SUPPORTED    129
+#define SCTP_ECN_SUPPORTED     130
 
 /* PR-SCTP policies */
 #define SCTP_PR_SCTP_NONE      0x0000