Update kernel headers

Update kernel headers to commit:
    bfba7bc8b7c2 ("Merge branch 'unmask-dscp-part-four'")

Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index f4d7e495dd015b902162779ab02437b19cc7dcca..a825d1659cba261c14101159aabfb8d2346ed79e 100644 (file)
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -2851,7 +2851,7 @@ union bpf_attr {
  *               **TCP_SYNCNT**, **TCP_USER_TIMEOUT**, **TCP_NOTSENT_LOWAT**,
  *               **TCP_NODELAY**, **TCP_MAXSEG**, **TCP_WINDOW_CLAMP**,
  *               **TCP_THIN_LINEAR_TIMEOUTS**, **TCP_BPF_DELACK_MAX**,
- *               **TCP_BPF_RTO_MIN**.
+ *               **TCP_BPF_RTO_MIN**, **TCP_BPF_SOCK_OPS_CB_FLAGS**.
  *             * **IPPROTO_IP**, which supports *optname* **IP_TOS**.
  *             * **IPPROTO_IPV6**, which supports the following *optname*\ s:
  *               **IPV6_TCLASS**, **IPV6_AUTOFLOWLABEL**.
@@ -7080,6 +7080,7 @@ enum {
        TCP_BPF_SYN             = 1005, /* Copy the TCP header */
        TCP_BPF_SYN_IP          = 1006, /* Copy the IP[46] and TCP header */
        TCP_BPF_SYN_MAC         = 1007, /* Copy the MAC, IP[46], and TCP header */
+       TCP_BPF_SOCK_OPS_CB_FLAGS = 1008, /* Get or Set TCP sock ops flags */
 };
 
 enum {

diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h
index 9efc42382fdb98f9e9b5470ae2a66ccf4d0ba4e1..1d2718dd9647254e9a9488b27c0d50caff8b924e 100644 (file)
--- a/include/uapi/linux/if_packet.h
+++ b/include/uapi/linux/if_packet.h
@@ -230,8 +230,8 @@ struct tpacket_hdr_v1 {
         * ts_first_pkt:
         *              Is always the time-stamp when the block was opened.
         *              Case a) ZERO packets
-        *                      No packets to deal with but atleast you know the
-        *                      time-interval of this block.
+        *                      No packets to deal with but at least you know
+        *                      the time-interval of this block.
         *              Case b) Non-zero packets
         *                      Use the ts of the first packet in the block.
         *
@@ -265,7 +265,8 @@ enum tpacket_versions {
    - struct tpacket_hdr
    - pad to TPACKET_ALIGNMENT=16
    - struct sockaddr_ll
-   - Gap, chosen so that packet data (Start+tp_net) alignes to TPACKET_ALIGNMENT=16
+   - Gap, chosen so that packet data (Start+tp_net) aligns to
+     TPACKET_ALIGNMENT=16
    - Start+tp_mac: [ Optional MAC header ]
    - Start+tp_net: Packet data, aligned to TPACKET_ALIGNMENT=16.
    - Pad to align to TPACKET_ALIGNMENT=16

diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
index 43cfcb010ccf52ebded9891826285c4ad5ccd8cc..a7d41bb6c68736cc53f258dc82456a64dd708eaa 100644 (file)
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h
@@ -141,7 +141,7 @@ struct in_addr {
  */
 #define IP_PMTUDISC_INTERFACE          4
 /* weaker version of IP_PMTUDISC_INTERFACE, which allows packets to get
- * fragmented if they exeed the interface mtu
+ * fragmented if they exceed the interface mtu
  */
 #define IP_PMTUDISC_OMIT               5
 

diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h
index d81cb69a26a9afa2f510f5b6cf4b6f20b11e7d21..2b3c82271e12bdf366561a8b71f9ace3bd5a7b9c 100644 (file)
--- a/include/uapi/linux/inet_diag.h
+++ b/include/uapi/linux/inet_diag.h
@@ -143,7 +143,7 @@ enum {
        INET_DIAG_SHUTDOWN,
 
        /*
-        * Next extenstions cannot be requested in struct inet_diag_req_v2:
+        * Next extensions cannot be requested in struct inet_diag_req_v2:
         * its field idiag_ext has only 8 bits.
         */
 

diff --git a/include/uapi/linux/ioam6_iptunnel.h b/include/uapi/linux/ioam6_iptunnel.h
index 750357b7caf96e34a360bb07858ac5669f7fd55f..64b471ded6d11aceecfa1db3ee2733c46e272c1f 100644 (file)
--- a/include/uapi/linux/ioam6_iptunnel.h
+++ b/include/uapi/linux/ioam6_iptunnel.h
@@ -50,6 +50,12 @@ enum {
        IOAM6_IPTUNNEL_FREQ_K,          /* u32 */
        IOAM6_IPTUNNEL_FREQ_N,          /* u32 */
 
+       /* Tunnel src address.
+        * For encap,auto modes.
+        * Optional (automatic if not provided).
+        */
+       IOAM6_IPTUNNEL_SRC,             /* struct in6_addr */
+
        __IOAM6_IPTUNNEL_MAX,
 };