Commit 68f6a7c6 authored Sep 25, 2014 by WANG Cong Committed by David S. Miller Sep 28, 2014

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 331b7292 ("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>

parent 02c5e844

net/sched/cls_tcindex.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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))