From 12826e1deb34890a54e887c5fe3065b6386d4995 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 17 Mar 2017 13:24:16 +0100 Subject: [PATCH] kernel headers update Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1422629 Upstream Status: iproute2.git commit e2ade8cefb7ff commit e2ade8cefb7ffe7d53b21a73b88a627d555c0371 Author: Stephen Hemminger Date: Thu Jan 12 17:45:30 2017 -0800 kernel headers update For flower, etc. Signed-off-by: Stephen Hemminger --- include/linux/netlink.h | 1 + include/linux/pkt_cls.h | 11 +++++++++++ include/linux/tc_act/tc_csum.h | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 8a7ca5c..a982b3c 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -27,6 +27,7 @@ #define NETLINK_ECRYPTFS 19 #define NETLINK_RDMA 20 #define NETLINK_CRYPTO 21 /* Crypto layer */ +#define NETLINK_SMC 22 /* SMC monitoring */ #define NETLINK_INET_DIAG NETLINK_SOCK_DIAG diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h index af17f3c..faed2e6 100644 --- a/include/linux/pkt_cls.h +++ b/include/linux/pkt_cls.h @@ -417,6 +417,17 @@ enum { TCA_FLOWER_KEY_ICMPV6_TYPE, /* u8 */ TCA_FLOWER_KEY_ICMPV6_TYPE_MASK,/* u8 */ + TCA_FLOWER_KEY_ARP_SIP, /* be32 */ + TCA_FLOWER_KEY_ARP_SIP_MASK, /* be32 */ + TCA_FLOWER_KEY_ARP_TIP, /* be32 */ + TCA_FLOWER_KEY_ARP_TIP_MASK, /* be32 */ + TCA_FLOWER_KEY_ARP_OP, /* u8 */ + TCA_FLOWER_KEY_ARP_OP_MASK, /* u8 */ + TCA_FLOWER_KEY_ARP_SHA, /* ETH_ALEN */ + TCA_FLOWER_KEY_ARP_SHA_MASK, /* ETH_ALEN */ + TCA_FLOWER_KEY_ARP_THA, /* ETH_ALEN */ + TCA_FLOWER_KEY_ARP_THA_MASK, /* ETH_ALEN */ + __TCA_FLOWER_MAX, }; diff --git a/include/linux/tc_act/tc_csum.h b/include/linux/tc_act/tc_csum.h index 8ac8041..a11bb35 100644 --- a/include/linux/tc_act/tc_csum.h +++ b/include/linux/tc_act/tc_csum.h @@ -21,7 +21,8 @@ enum { TCA_CSUM_UPDATE_FLAG_IGMP = 4, TCA_CSUM_UPDATE_FLAG_TCP = 8, TCA_CSUM_UPDATE_FLAG_UDP = 16, - TCA_CSUM_UPDATE_FLAG_UDPLITE = 32 + TCA_CSUM_UPDATE_FLAG_UDPLITE = 32, + TCA_CSUM_UPDATE_FLAG_SCTP = 64, }; struct tc_csum { -- 1.8.3.1