update headers to current net-2.6.25

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>

diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index e68f362cae18754c764e516df055057bb10dbd5f..2e4dd9d3e626ace98c6cb159ae1f037b6c1debee 100644 (file)
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -40,6 +40,8 @@ union nf_inet_addr {
        u_int32_t       all[4];
        __be32          ip;
        __be32          ip6[4];
+       struct in_addr  in;
+       struct in6_addr in6;
 };
 
 #endif /*__LINUX_NETFILTER_H*/

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 30b8571e6b34c25b2311291ad460e2d1754e7862..afb79d08dfb1c56aca8065b3b737998031804d36 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -409,7 +409,8 @@ enum
 #define        TCF_EM_U32              3
 #define        TCF_EM_META             4
 #define        TCF_EM_TEXT             5
-#define        TCF_EM_MAX              5
+#define TCF_EM_VLAN            6
+#define        TCF_EM_MAX              6
 
 enum
 {

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 919af93b70596e70a06bdd10363c1d57a1aa50f4..32761352e858cd4c95b15ab215b8c39be9fe756e 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -83,6 +83,8 @@ struct tc_ratespec
        __u32           rate;
 };
 
+#define TC_RTAB_SIZE   1024
+
 /* FIFO section */
 
 struct tc_fifo_qopt

diff --git a/include/linux/tc_ematch/tc_em_meta.h b/include/linux/tc_ematch/tc_em_meta.h
index e21937cf91d0e4510659566215260b13a9c9b6b8..c50d2ba5caf004ea9b8a33a12d27fa859a4e4864 100644 (file)
--- a/include/linux/tc_ematch/tc_em_meta.h
+++ b/include/linux/tc_ematch/tc_em_meta.h
@@ -81,6 +81,7 @@ enum
        TCF_META_ID_SK_SNDTIMEO,
        TCF_META_ID_SK_SENDMSG_OFF,
        TCF_META_ID_SK_WRITE_PENDING,
+       TCF_META_ID_VLAN_TAG,
        __TCF_META_ID_MAX
 };
 #define TCF_META_ID_MAX (__TCF_META_ID_MAX - 1)

diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index d28e0c4b6c45829d51656c856c28b31976531a87..24999ddae4ea8d6e06807df0dd868d08f237a037 100644 (file)
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -91,9 +91,9 @@ struct xfrm_replay_state
 };
 
 struct xfrm_algo {
-       char    alg_name[64];
-       int     alg_key_len;    /* in bits */
-       char    alg_key[0];
+       char            alg_name[64];
+       unsigned int    alg_key_len;    /* in bits */
+       char            alg_key[0];
 };
 
 struct xfrm_stats {