Commit abc3bc58 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NET]: Kill skb->tc_classid 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8728b834

include/linux/skbuff.h

+0 −3
Original line number Diff line number Diff line
@@ -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

include/net/act_api.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/core/skbuff.c

+0 −2
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ void __kfree_skb(struct sk_buff *skb) 
	skb->tc_index = 0;

#ifdef CONFIG_NET_CLS_ACT

	skb->tc_verd = 0;

	skb->tc_classid = 0;

#endif

#endif
@@ -376,7 +375,6 @@ struct sk_buff *skb_clone(struct sk_buff *skb, unsigned int __nocast gfp_mask) 
	n->tc_verd = CLR_TC_OK2MUNGE(n->tc_verd);

	n->tc_verd = CLR_TC_MUNGED(n->tc_verd);

	C(input_dev);

	C(tc_classid);

#endif



#endif

net/sched/act_api.c

+1 −6
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ int tcf_action_exec(struct sk_buff *skb, struct tc_action *act, 
	while ((a = act) != NULL) {

repeat:

		if (a->ops && a->ops->act) {

			ret = a->ops->act(&skb, a);

			ret = a->ops->act(&skb, a, res);

			if (TC_MUNGED & skb->tc_verd) {

				/* copied already, allow trampling */

				skb->tc_verd = SET_TC_OK2MUNGE(skb->tc_verd);
@@ -179,11 +179,6 @@ int tcf_action_exec(struct sk_buff *skb, struct tc_action *act, 
		act = a->next;

	}

exec_done:

	if (skb->tc_classid > 0) {

		res->classid = skb->tc_classid;

		res->class = 0;

		skb->tc_classid = 0;

	}

	return ret;

}

net/sched/gact.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ tcf_gact_cleanup(struct tc_action *a, int bind) 
}



static int

tcf_gact(struct sk_buff **pskb, struct tc_action *a)

tcf_gact(struct sk_buff **pskb, struct tc_action *a, struct tcf_result *res)

{

	struct tcf_gact *p = PRIV(a, gact);

	struct sk_buff *skb = *pskb;