Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdc5432a authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

net, sched: add skb_at_tc_ingress helper 



Add a skb_at_tc_ingress() as this will be needed elsewhere as well and
can hide the ugly ifdef.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4156afaf

include/net/sch_generic.h

+9 −0
Original line number Diff line number Diff line
@@ -407,6 +407,15 @@ bool tcf_destroy(struct tcf_proto *tp, bool force); 
void tcf_destroy_chain(struct tcf_proto __rcu **fl);

int skb_do_redirect(struct sk_buff *);



static inline bool skb_at_tc_ingress(const struct sk_buff *skb)

{

#ifdef CONFIG_NET_CLS_ACT

	return G_TC_AT(skb->tc_verd) & AT_INGRESS;

#else

	return false;

#endif

}



/* Reset all TX qdiscs greater then index of a device.  */

static inline void qdisc_reset_all_tx_gt(struct net_device *dev, unsigned int i)

{

net/sched/cls_bpf.c

+1 −5
Original line number Diff line number Diff line
@@ -79,12 +79,8 @@ static int cls_bpf_classify(struct sk_buff *skb, const struct tcf_proto *tp, 
			    struct tcf_result *res)

{

	struct cls_bpf_head *head = rcu_dereference_bh(tp->root);

	bool at_ingress = skb_at_tc_ingress(skb);

	struct cls_bpf_prog *prog;

#ifdef CONFIG_NET_CLS_ACT

	bool at_ingress = G_TC_AT(skb->tc_verd) & AT_INGRESS;

#else

	bool at_ingress = false;

#endif

	int ret = -1;



	if (unlikely(!skb_mac_header_was_set(skb)))