update headers to 3.20-rc1

Add net_namespace.h and update other headers

diff --git a/include/linux/fou.h b/include/linux/fou.h
index 8e6380599bf577962890952c4edce83dd510fec6..13a78e41309d6882c6561bb7e06ae1bed47d9637 100644 (file)
--- a/include/linux/fou.h
+++ b/include/linux/fou.h
@@ -14,6 +14,7 @@ enum {
        FOU_ATTR_AF,                            /* u8 */
        FOU_ATTR_IPPROTO,                       /* u8 */
        FOU_ATTR_TYPE,                          /* u8 */
+       FOU_ATTR_REMCSUM_NOPARTIAL,             /* flag */
 
        __FOU_ATTR_MAX,
 };

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index ac64724c94254f6543d1fbf8150a25463ba85c56..3450c3fbdc653533549f9ed2147559d1f14a1b4e 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -372,6 +372,7 @@ enum {
        IFLA_VXLAN_REMCSUM_TX,
        IFLA_VXLAN_REMCSUM_RX,
        IFLA_VXLAN_GBP,
+       IFLA_VXLAN_REMCSUM_NOPARTIAL,
        __IFLA_VXLAN_MAX
 };
 #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)

diff --git a/include/linux/net_namespace.h b/include/linux/net_namespace.h
new file mode 100644 (file)
index 0000000..9a92b7e
--- /dev/null
+++ b/include/linux/net_namespace.h
@@ -0,0 +1,23 @@
+/* Copyright (c) 2015 6WIND S.A.
+ * Author: Nicolas Dichtel <nicolas.dichtel@6wind.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ */
+#ifndef _LINUX_NET_NAMESPACE_H_
+#define _LINUX_NET_NAMESPACE_H_
+
+/* Attributes of RTM_NEWNSID/RTM_GETNSID messages */
+enum {
+       NETNSA_NONE,
+#define NETNSA_NSID_NOT_ASSIGNED -1
+       NETNSA_NSID,
+       NETNSA_PID,
+       NETNSA_FD,
+       __NETNSA_MAX,
+};
+
+#define NETNSA_MAX             (__NETNSA_MAX - 1)
+
+#endif /* _LINUX_NET_NAMESPACE_H_ */

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index d62316baae942c43b2558ed2768c88950516126c..534b847107453019d362e9f9f9c0969fc3100c8b 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -774,6 +774,8 @@ enum {
 
        TCA_FQ_FLOW_REFILL_DELAY,       /* flow credit refill delay in usec */
 
+       TCA_FQ_ORPHAN_MASK,     /* mask applied to orphaned skb hashes */
+
        __TCA_FQ_MAX
 };