Skip to content

Commit

Permalink
Merge branch 'bpf-next'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
davem330 committed Sep 15, 2016
2 parents 07c0f09 + f53d8c7 commit c865250
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
5 changes: 1 addition & 4 deletions net/sched/act_bpf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions net/sched/cls_bpf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit c865250

Please sign in to comment.