]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
Update kernel headers
authorDavid Ahern <dsahern@gmail.com>
Fri, 20 Jul 2018 15:57:23 +0000 (08:57 -0700)
committerDavid Ahern <dsahern@gmail.com>
Fri, 20 Jul 2018 15:57:23 +0000 (08:57 -0700)
Update kernel headers to
a3eed83a1895 ("Merge branch 'qed-Add-support-for-phy-module-query'")

Signed-off-by: David Ahern <dsahern@gmail.com>
include/uapi/linux/pkt_cls.h
include/uapi/linux/tc_act/tc_tunnel_key.h

index c4262d91159650b7f649b1a0655bc1902e9b6af5..b4512254036b9658b3e0a176103a47d911579f76 100644 (file)
@@ -473,6 +473,11 @@ enum {
        TCA_FLOWER_KEY_CVLAN_PRIO,      /* u8   */
        TCA_FLOWER_KEY_CVLAN_ETH_TYPE,  /* be16 */
 
+       TCA_FLOWER_KEY_ENC_IP_TOS,      /* u8 */
+       TCA_FLOWER_KEY_ENC_IP_TOS_MASK, /* u8 */
+       TCA_FLOWER_KEY_ENC_IP_TTL,      /* u8 */
+       TCA_FLOWER_KEY_ENC_IP_TTL_MASK, /* u8 */
+
        __TCA_FLOWER_MAX,
 };
 
index e284fec8c467cc7bfdb121432f63dadfce42b712..be384d63e1b56b297707cb5159c50ea4e3dff0dc 100644 (file)
@@ -39,6 +39,8 @@ enum {
        TCA_TUNNEL_KEY_ENC_OPTS,        /* Nested TCA_TUNNEL_KEY_ENC_OPTS_
                                         * attributes
                                         */
+       TCA_TUNNEL_KEY_ENC_TOS,         /* u8 */
+       TCA_TUNNEL_KEY_ENC_TTL,         /* u8 */
        __TCA_TUNNEL_KEY_MAX,
 };