Update kernel headers to 3.0

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index e4a3a2d7a7b8b3db03389464f15c82dbba7226c5..304c44fdb12e4ad6f96a67ca3b3d2bd90dd2e4ea 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -136,6 +136,7 @@ enum {
        IFLA_PORT_SELF,
        IFLA_AF_SPEC,
        IFLA_GROUP,             /* Group the device belongs to */
+       IFLA_NET_NS_FD,
        __IFLA_MAX
 };
 

diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 9b7240d5b15159d64b36be215e52d14a63853d22..54771312ff0743ab6f34f16231a18ad112ad01aa 100644 (file)
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -3,6 +3,7 @@
 
 #include <linux/types.h>
 
+#include <linux/sysctl.h>
 
 /* Responses from hook functions. */
 #define NF_DROP 0

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index f55ed8c5fc0b6f929c588bcbf8369256694fe41d..dcf71830009f52bbb339746def9a45ef0d6bc8e8 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -24,6 +24,7 @@
 /* leave room for NETLINK_DM (DM Events) */
 #define NETLINK_SCSITRANSPORT  18      /* SCSI Transports */
 #define NETLINK_ECRYPTFS       19
+#define NETLINK_RDMA           20
 
 #define MAX_LINKS 32           
 

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 3a02e02085759aa2b758622f0312bd69de139a24..c5336705921fdae6a3feb8ea99dfa252ae012c52 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -588,4 +588,19 @@ struct tc_sfb_xstats {
 
 #define SFB_MAX_PROB 0xFFFF
 
+/* QFQ */
+enum {
+       TCA_QFQ_UNSPEC,
+       TCA_QFQ_WEIGHT,
+       TCA_QFQ_LMAX,
+       __TCA_QFQ_MAX
+};
+
+#define TCA_QFQ_MAX    (__TCA_QFQ_MAX - 1)
+
+struct tc_qfq_stats {
+       __u32 weight;
+       __u32 lmax;
+};
+
 #endif