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