summaryrefslogtreecommitdiffstats
path: root/net/sched
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2014-09-25 12:06:05 -0700
committerDavid S. Miller <davem@davemloft.net>2014-09-28 17:34:35 -0400
commit68f6a7c6c9817f2e6a66b59893de3c901ae5608c (patch)
tree94b03e67ef20eba2786a3db1123e18464c05d7a1 /net/sched
parent02c5e84413dae4aa650536097d4195a356217d3d (diff)
downloadop-kernel-dev-68f6a7c6c9817f2e6a66b59893de3c901ae5608c.zip
op-kernel-dev-68f6a7c6c9817f2e6a66b59893de3c901ae5608c.tar.gz
net_sched: fix another regression in cls_tcindex
Clearly the following change is not expected: - if (!cp.perfect && !cp.h) - cp.alloc_hash = cp.hash; + if (!cp->perfect && cp->h) + cp->alloc_hash = cp->hash; Fixes: commit 331b72922c5f58d48fd ("net: sched: RCU cls_tcindex") Cc: John Fastabend <john.fastabend@gmail.com> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Acked-by: John Fastabend <john.r.fastabend@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/cls_tcindex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c
index 365b23b..8d0e83d 100644
--- a/net/sched/cls_tcindex.c
+++ b/net/sched/cls_tcindex.c
@@ -303,7 +303,7 @@ tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base,
cp->hash = DEFAULT_HASH_SIZE;
}
- if (!cp->perfect && cp->h)
+ if (!cp->perfect && !cp->h)
cp->alloc_hash = cp->hash;
/* Note: this could be as restrictive as if (handle & ~(mask >> shift))
OpenPOWER on IntegriCloud