---

yaml --- r: 232853 b: refs/heads/master c: 8587523 h: refs/heads/master i: 232851: ca1b61a v: v3
git-mirror · Feb 1, 2011 · e8c4113 · e8c4113
1 parent d45b1d1
commit e8c4113
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc09b5f6466528867b280f6eb4077311aa099588
+refs/heads/master: 8587523640441a9ff2564ebc6efeb39497ad6709
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2563,7 +2563,8 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb,
 
 	map = rcu_dereference(rxqueue->rps_map);
 	if (map) {
-		if (map->len == 1) {
+		if (map->len == 1 &&
+		    !rcu_dereference_raw(rxqueue->rps_flow_table)) {
 			tcpu = map->cpus[0];
 			if (cpu_online(tcpu))
 				cpu = tcpu;