www.usr.com/support/gpl/USR9113_release1.0.tar.gz

[bcm963xx.git] / kernel / linux / include / linux / skbuff.h

diff --git a/kernel/linux/include/linux/skbuff.h b/kernel/linux/include/linux/skbuff.h
index 5d1734a..d232d1a 100755 (executable)
--- a/kernel/linux/include/linux/skbuff.h
+++ b/kernel/linux/include/linux/skbuff.h
@@ -189,6 +189,8 @@ struct skb_shared_info {
  *      @private: Data which is private to the HIPPI implementation
  *     @tc_index: Traffic control index
  */
+struct ip_conntrack;
+struct ip_nat_info_manip; 
 
 struct sk_buff {
        /* These two members must be first. */
@@ -268,14 +270,6 @@ struct sk_buff {
                __u32           ifield;
        } private;
 #endif
-#ifdef CONFIG_NET_SCHED
-       __u32                   tc_index;        /* traffic control index */
-#ifdef CONFIG_NET_CLS_ACT
-       __u32           tc_verd;               /* traffic control verdict */
-       __u32           tc_classid;            /* traffic control classid */
- #endif
-
-#endif
 #if defined(CONFIG_MIPS_BRCM)
 #define FROM_WAN               0x1000
 #define FREE_DATA              0
@@ -296,6 +290,17 @@ struct sk_buff {
        unsigned char           retfreeq_data_prealloc; 
        /* Flag to indicate where the skb is received from, used for WAN2WAN blocking */
        unsigned short          rcvfrom;
+
+       /* NAT cache fields */
+        __u32                   nat_cache_hit;
+        void *                  nat_cache_rule;
+       void                    (*nat_cache_modify)(struct sk_buff *skb);
+       void                    (*nat_cache_add)(struct ip_conntrack *ct,struct ip_nat_info_manip *manip, struct sk_buff *skb);
+
+       /* NET QOS */
+       __u32                   tc_index;        /* traffic control index */
+       __u32                   tc_verd;         /* traffic control verdict */
+       __u32                   tc_classid;      /* traffic control classid */
 #endif 
 
 
@@ -306,6 +311,14 @@ struct sk_buff {
                                *data,
                                *tail,
                                *end;
+#ifdef CONFIG_NET_SCHED
+       __u32                   tc_index;        /* traffic control index */
+#ifdef CONFIG_NET_CLS_ACT
+       __u32           tc_verd;               /* traffic control verdict */
+       __u32           tc_classid;            /* traffic control classid */
+ #endif
+
+#endif
 };
 
 #ifdef __KERNEL__