From 17ff82b293c48f7feac121a084f862bcae14ef24 Mon Sep 17 00:00:00 2001
From: Radu Rendec <radu.rendec@ines.ro>
Date: Sat, 10 Nov 2007 21:54:50 -0800
Subject: [PATCH] --- yaml --- r: 73527 b: refs/heads/master c:
 b226801676d9533d09da511eb379fe970fa1a770 h: refs/heads/master i:   73525:
 1fd22970d05fde46c0f193defd07f7923a4aedfa   73523:
 6fcb5a11e996e597b761235ccdea2d7abf76e62a   73519:
 673ef0d7596d381dd628204cc770b5d8b55fcb3f v: v3

---
 [refs]                    |  2 +-
 trunk/net/sched/cls_u32.c | 12 +-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 87204e5336a6..2b911d9385ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78608ba0326f1448f9a10dbb402a38192559f639
+refs/heads/master: b226801676d9533d09da511eb379fe970fa1a770
diff --git a/trunk/net/sched/cls_u32.c b/trunk/net/sched/cls_u32.c
index 53171029439f..c39008209164 100644
--- a/trunk/net/sched/cls_u32.c
+++ b/trunk/net/sched/cls_u32.c
@@ -613,17 +613,7 @@ static int u32_change(struct tcf_proto *tp, unsigned long base, u32 handle,
 	memcpy(&n->sel, s, sizeof(*s) + s->nkeys*sizeof(struct tc_u32_key));
 	n->ht_up = ht;
 	n->handle = handle;
-{
-	u8 i = 0;
-	u32 mask = ntohl(s->hmask);
-	if (mask) {
-		while (!(mask & 1)) {
-			i++;
-			mask>>=1;
-		}
-	}
-	n->fshift = i;
-}
+	n->fshift = s->hmask ? ffs(ntohl(s->hmask)) - 1 : 0;
 
 #ifdef CONFIG_CLS_U32_MARK
 	if (tb[TCA_U32_MARK-1]) {