update kernel headers and add tc_connmark.h

Needed for later tc action patches

diff --git a/include/linux/fou.h b/include/linux/fou.h
index 13a78e41309d6882c6561bb7e06ae1bed47d9637..744c32380e6dc08fe9f398170908659f1cb130af 100644 (file)
--- a/include/linux/fou.h
+++ b/include/linux/fou.h
@@ -25,6 +25,7 @@ enum {
        FOU_CMD_UNSPEC,
        FOU_CMD_ADD,
        FOU_CMD_DEL,
+       FOU_CMD_GET,
 
        __FOU_CMD_MAX,
 };

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 6689e8fdf4f03f68e69d3ba9096234e90dd51cbc..3d0d6131773355a8c4e033b1a13c88bf33ded660 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -463,6 +463,9 @@ enum {
        IFLA_VF_SPOOFCHK,       /* Spoof Checking on/off switch */
        IFLA_VF_LINK_STATE,     /* link state enable/disable/auto switch */
        IFLA_VF_RATE,           /* Min and Max TX Bandwidth Allocation */
+       IFLA_VF_RSS_QUERY_EN,   /* RSS Redirection Table and Hash Key query
+                                * on/off switch
+                                */
        __IFLA_VF_MAX,
 };
 
@@ -507,6 +510,11 @@ struct ifla_vf_link_state {
        __u32 link_state;
 };
 
+struct ifla_vf_rss_query_en {
+       __u32 vf;
+       __u32 setting;
+};
+
 /* VF ports management section
  *
  *     Nested layout of set/get msg is:

diff --git a/include/linux/tc_act/tc_connmark.h b/include/linux/tc_act/tc_connmark.h
new file mode 100644 (file)
index 0000000..994b097
--- /dev/null
+++ b/include/linux/tc_act/tc_connmark.h
@@ -0,0 +1,22 @@
+#ifndef __UAPI_TC_CONNMARK_H
+#define __UAPI_TC_CONNMARK_H
+
+#include <linux/types.h>
+#include <linux/pkt_cls.h>
+
+#define TCA_ACT_CONNMARK 14
+
+struct tc_connmark {
+       tc_gen;
+       __u16 zone;
+};
+
+enum {
+       TCA_CONNMARK_UNSPEC,
+       TCA_CONNMARK_PARMS,
+       TCA_CONNMARK_TM,
+       __TCA_CONNMARK_MAX
+};
+#define TCA_CONNMARK_MAX (__TCA_CONNMARK_MAX - 1)
+
+#endif