diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/skbuff.h | 3 | ||||
-rw-r--r-- | include/net/act_api.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 76c68851474c..f10a8b9628b0 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -196,7 +196,6 @@ struct skb_shared_info { | |||
196 | * @private: Data which is private to the HIPPI implementation | 196 | * @private: Data which is private to the HIPPI implementation |
197 | * @tc_index: Traffic control index | 197 | * @tc_index: Traffic control index |
198 | * @tc_verd: traffic control verdict | 198 | * @tc_verd: traffic control verdict |
199 | * @tc_classid: traffic control classid | ||
200 | */ | 199 | */ |
201 | 200 | ||
202 | struct sk_buff { | 201 | struct sk_buff { |
@@ -275,9 +274,7 @@ struct sk_buff { | |||
275 | __u32 tc_index; /* traffic control index */ | 274 | __u32 tc_index; /* traffic control index */ |
276 | #ifdef CONFIG_NET_CLS_ACT | 275 | #ifdef CONFIG_NET_CLS_ACT |
277 | __u32 tc_verd; /* traffic control verdict */ | 276 | __u32 tc_verd; /* traffic control verdict */ |
278 | __u32 tc_classid; /* traffic control classid */ | ||
279 | #endif | 277 | #endif |
280 | |||
281 | #endif | 278 | #endif |
282 | 279 | ||
283 | 280 | ||
diff --git a/include/net/act_api.h b/include/net/act_api.h index ed00a995f576..b55eb7c7f033 100644 --- a/include/net/act_api.h +++ b/include/net/act_api.h | |||
@@ -63,7 +63,7 @@ struct tc_action_ops | |||
63 | __u32 type; /* TBD to match kind */ | 63 | __u32 type; /* TBD to match kind */ |
64 | __u32 capab; /* capabilities includes 4 bit version */ | 64 | __u32 capab; /* capabilities includes 4 bit version */ |
65 | struct module *owner; | 65 | struct module *owner; |
66 | int (*act)(struct sk_buff **, struct tc_action *); | 66 | int (*act)(struct sk_buff **, struct tc_action *, struct tcf_result *); |
67 | int (*get_stats)(struct sk_buff *, struct tc_action *); | 67 | int (*get_stats)(struct sk_buff *, struct tc_action *); |
68 | int (*dump)(struct sk_buff *, struct tc_action *,int , int); | 68 | int (*dump)(struct sk_buff *, struct tc_action *,int , int); |
69 | int (*cleanup)(struct tc_action *, int bind); | 69 | int (*cleanup)(struct tc_action *, int bind); |