Update kernel headers

Update kernel headers to commit:
    afae3cc2da10 ("net: atheros: simplify the return expression of atl2_phy_setup_autoneg_adv()")

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index c819f45b3542a863e417c197e92717fbfa201f34..027f91ec267c697730265d166610b073532f7695 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -557,7 +557,12 @@ union bpf_attr {
                __aligned_u64   line_info;      /* line info */
                __u32           line_info_cnt;  /* number of bpf_line_info records */
                __u32           attach_btf_id;  /* in-kernel BTF type id to attach to */
-               __u32           attach_prog_fd; /* 0 to attach to vmlinux */
+               union {
+                       /* valid prog_fd to attach to bpf prog */
+                       __u32           attach_prog_fd;
+                       /* or valid module BTF object fd or 0 to attach to vmlinux */
+                       __u32           attach_btf_obj_fd;
+               };
        };
 
        struct { /* anonymous struct used by BPF_OBJ_* commands */
@@ -3787,6 +3792,36 @@ union bpf_attr {
  *             *ARG_PTR_TO_BTF_ID* of type *task_struct*.
  *     Return
  *             Pointer to the current task.
+ *
+ * long bpf_bprm_opts_set(struct linux_binprm *bprm, u64 flags)
+ *     Description
+ *             Set or clear certain options on *bprm*:
+ *
+ *             **BPF_F_BPRM_SECUREEXEC** Set the secureexec bit
+ *             which sets the **AT_SECURE** auxv for glibc. The bit
+ *             is cleared if the flag is not specified.
+ *     Return
+ *             **-EINVAL** if invalid *flags* are passed, zero otherwise.
+ *
+ * u64 bpf_ktime_get_coarse_ns(void)
+ *     Description
+ *             Return a coarse-grained version of the time elapsed since
+ *             system boot, in nanoseconds. Does not include time the system
+ *             was suspended.
+ *
+ *             See: **clock_gettime**\ (**CLOCK_MONOTONIC_COARSE**)
+ *     Return
+ *             Current *ktime*.
+ *
+ * long bpf_ima_inode_hash(struct inode *inode, void *dst, u32 size)
+ *     Description
+ *             Returns the stored IMA hash of the *inode* (if it's avaialable).
+ *             If the hash is larger than *size*, then only *size*
+ *             bytes will be copied to *dst*
+ *     Return
+ *             The **hash_algo** is returned on success,
+ *             **-EOPNOTSUP** if IMA is disabled or **-EINVAL** if
+ *             invalid arguments are passed.
  */
 #define __BPF_FUNC_MAPPER(FN)          \
        FN(unspec),                     \
@@ -3948,6 +3983,9 @@ union bpf_attr {
        FN(task_storage_get),           \
        FN(task_storage_delete),        \
        FN(get_current_task_btf),       \
+       FN(bprm_opts_set),              \
+       FN(ktime_get_coarse_ns),        \
+       FN(ima_inode_hash),             \
        /* */
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
@@ -4119,6 +4157,11 @@ enum bpf_lwt_encap_mode {
        BPF_LWT_ENCAP_IP,
 };
 
+/* Flags for bpf_bprm_opts_set helper */
+enum {
+       BPF_F_BPRM_SECUREEXEC   = (1ULL << 0),
+};
+
 #define __bpf_md_ptr(type, name)       \
 union {                                        \
        type name;                      \

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 307e5c245e9fe3374d15c0bbf7030caa5e22580d..faa90938a589aa245b453b622eb407135bfa1286 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -586,6 +586,8 @@ enum {
        IFLA_MACVLAN_MACADDR,
        IFLA_MACVLAN_MACADDR_DATA,
        IFLA_MACVLAN_MACADDR_COUNT,
+       IFLA_MACVLAN_BC_QUEUE_LEN,
+       IFLA_MACVLAN_BC_QUEUE_LEN_USED,
        __IFLA_MACVLAN_MAX,
 };
 

diff --git a/include/uapi/linux/seg6_local.h b/include/uapi/linux/seg6_local.h
index 5312de80bcfae74c73bd308f58ec2881f5b4f357..bb5c8ddfcec52f06412fc7aedf69ef360698fc2f 100644 (file)
--- a/include/uapi/linux/seg6_local.h
+++ b/include/uapi/linux/seg6_local.h
@@ -26,6 +26,7 @@ enum {
        SEG6_LOCAL_IIF,
        SEG6_LOCAL_OIF,
        SEG6_LOCAL_BPF,
+       SEG6_LOCAL_VRFTABLE,
        __SEG6_LOCAL_MAX,
 };
 #define SEG6_LOCAL_MAX (__SEG6_LOCAL_MAX - 1)

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index ee670e8848a4b3dd23e13efd0ed8117bf8453eb5..6f1a38fc3172a4bea10d7519022a24f9f24963e9 100644 (file)
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -343,11 +343,15 @@ struct tcp_diag_md5sig {
 
 /* setsockopt(fd, IPPROTO_TCP, TCP_ZEROCOPY_RECEIVE, ...) */
 
+#define TCP_RECEIVE_ZEROCOPY_FLAG_TLB_CLEAN_HINT 0x1
 struct tcp_zerocopy_receive {
        __u64 address;          /* in: address of mapping */
        __u32 length;           /* in/out: number of bytes to map/mapped */
        __u32 recv_skip_hint;   /* out: amount of bytes to skip */
        __u32 inq; /* out: amount of bytes in read queue */
        __s32 err; /* out: socket error */
+       __u64 copybuf_address;  /* in: copybuf address (small reads) */
+       __s32 copybuf_len; /* in/out: copybuf bytes avail/used or error */
+       __u32 flags; /* in: flags */
 };
 #endif /* _LINUX_TCP_H */