4 files changed, 6 insertions, 5 deletions

diff --git a/include/linux/filter.h b/include/linux/filter.h
index 6d944369ca87..ff65d22cf336 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -747,7 +747,7 @@ bpf_ctx_narrow_access_ok(u32 off, u32 size, u32 size_default)
         return size <= size_default && (size & (size - 1)) == 0;
 }
 
-#define bpf_ctx_wide_store_ok(off, size, type, field)                   \
+#define bpf_ctx_wide_access_ok(off, size, type, field)                  \
         (size == sizeof(__u64) &&                                       \
         off >= offsetof(type, field) &&                                 \
         off + sizeof(__u64) <= offsetofend(type, field) &&              \
diff --git a/include/net/tcp.h b/include/net/tcp.h
index cca3c59b98bf..f42d300f0cfa 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1064,7 +1064,8 @@ void tcp_get_default_congestion_control(struct net *net, char *name);
 void tcp_get_available_congestion_control(char *buf, size_t len);
 void tcp_get_allowed_congestion_control(char *buf, size_t len);
 int tcp_set_allowed_congestion_control(char *allowed);
-int tcp_set_congestion_control(struct sock *sk, const char *name, bool load, bool reinit);
+int tcp_set_congestion_control(struct sock *sk, const char *name, bool load,
+                               bool reinit, bool cap_net_admin);
 u32 tcp_slow_start(struct tcp_sock *tp, u32 acked);
 void tcp_cong_avoid_ai(struct tcp_sock *tp, u32 w, u32 acked);
 
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 82699845ef79..fa1c753dcdbc 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -3248,7 +3248,7 @@ struct bpf_sock_addr {
         __u32 user_ip4;         /* Allows 1,2,4-byte read and 4-byte write.
                                  * Stored in network byte order.
                                  */
-        __u32 user_ip6[4];      /* Allows 1,2,4-byte read and 4,8-byte write.
+        __u32 user_ip6[4];      /* Allows 1,2,4,8-byte read and 4,8-byte write.
                                  * Stored in network byte order.
                                  */
         __u32 user_port;        /* Allows 4-byte read and write.
@@ -3260,7 +3260,7 @@ struct bpf_sock_addr {
         __u32 msg_src_ip4;      /* Allows 1,2,4-byte read and 4-byte write.
                                  * Stored in network byte order.
                                  */
-        __u32 msg_src_ip6[4];   /* Allows 1,2,4-byte read and 4,8-byte write.
+        __u32 msg_src_ip6[4];   /* Allows 1,2,4,8-byte read and 4,8-byte write.
                                  * Stored in network byte order.
                                  */
         __bpf_md_ptr(struct bpf_sock *, sk);
diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h
index 1f623252abe8..18f185299f47 100644
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -1174,7 +1174,7 @@ enum {
         TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME, /* s64 */
         TCA_TAPRIO_ATTR_SCHED_CYCLE_TIME_EXTENSION, /* s64 */
         TCA_TAPRIO_ATTR_FLAGS, /* u32 */
-        TCA_TAPRIO_ATTR_TXTIME_DELAY, /* s32 */
+        TCA_TAPRIO_ATTR_TXTIME_DELAY, /* u32 */
         __TCA_TAPRIO_ATTR_MAX,
 };