Merge branch 'for-4.9/block-smp' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / net / sched / act_bpf.c

diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c
index bfa8707..1d39600 100644 (file)
--- a/net/sched/act_bpf.c
+++ b/net/sched/act_bpf.c
@@ -39,13 +39,10 @@ static struct tc_action_ops act_bpf_ops;
 static int tcf_bpf(struct sk_buff *skb, const struct tc_action *act,
                   struct tcf_result *res)
 {
+       bool at_ingress = skb_at_tc_ingress(skb);
        struct tcf_bpf *prog = to_bpf(act);
        struct bpf_prog *filter;
        int action, filter_res;
-       bool at_ingress = G_TC_AT(skb->tc_verd) & AT_INGRESS;
-
-       if (unlikely(!skb_mac_header_was_set(skb)))
-               return TC_ACT_UNSPEC;
 
        tcf_lastuse_update(&prog->tcf_tm);
        bstats_cpu_update(this_cpu_ptr(prog->common.cpu_bstats), skb);