diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-09-15 19:29:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-15 19:29:53 -0400 |
| commit | c865250164a6817d0a0b18a0050f0c42cf725925 (patch) | |
| tree | 45d072e34316e66eca8a7e93c4d9be101347a9c5 /net/sched | |
| parent | net/sched: act_tunnel_key: Remove rcu_read_lock protection (diff) | |
| parent | bpf: use skb_at_tc_ingress helper in tcf_bpf (diff) | |
| download | linux-dev-c865250164a6817d0a0b18a0050f0c42cf725925.tar.xz linux-dev-c865250164a6817d0a0b18a0050f0c42cf725925.zip | |
Merge branch 'bpf-next'
Daniel Borkmann says:
====================
Misc cls_bpf/act_bpf improvements
Two minor improvements to {cls,act}_bpf. For details please see
individual patches.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/sched/act_bpf.c | 5 | ||||
| -rw-r--r-- | net/sched/cls_bpf.c | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c index bfa870731e74..1d3960033f61 100644 --- 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); diff --git a/net/sched/cls_bpf.c b/net/sched/cls_bpf.c index 4742f415ee5b..1d92d4d3f222 100644 --- a/net/sched/cls_bpf.c +++ b/net/sched/cls_bpf.c @@ -83,9 +83,6 @@ static int cls_bpf_classify(struct sk_buff *skb, const struct tcf_proto *tp, struct cls_bpf_prog *prog; int ret = -1; - if (unlikely(!skb_mac_header_was_set(skb))) - return -1; - /* Needed here for accessing maps. */ rcu_read_lock(); list_for_each_entry_rcu(prog, &head->plist, link) { |