[NET]: Kill skb->tc_classid

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

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 {
  *      @private: Data which is private to the HIPPI implementation
  *      @tc_index: Traffic control index
  *      @tc_verd: traffic control verdict
- *      @tc_classid: traffic control classid
  */
 
 struct sk_buff {
@@ -275,9 +274,7 @@ struct sk_buff {
        __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
 
 
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
         __u32   type; /* TBD to match kind */
         __u32   capab;  /* capabilities includes 4 bit version */
         struct module           *owner;
-        int     (*act)(struct sk_buff **, struct tc_action *);
+        int     (*act)(struct sk_buff **, struct tc_action *, struct tcf_result *);
         int     (*get_stats)(struct sk_buff *, struct tc_action *);
         int     (*dump)(struct sk_buff *, struct tc_action *,int , int);
         int     (*cleanup)(struct tc_action *, int bind);