kernel headers update

For flower, etc.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 8a7ca5c6f9ae8a7d77ca50c096eb06f9e5112e35..a982b3c004395d27d6f6ce1d93f3ab3fc077a9a3 100644 (file)
--- 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 a081efbd61a27426a9e8bdd12e7c94c165a8d194..1e5e1ddfdaca84e7991ee360a8422f52b37cd2c3 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -416,6 +416,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 8ac8041ab5f134b74391f5470cef16f3f435ed1c..a11bb355dbfb2ba9b65a2e2b6c2eac9dc3b0e6c0 100644 (file)
--- 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 {