From f774b8a2b9a72ed81a2287206ebd38c958d1dd29 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 6 Jun 2011 20:50:03 +0000 Subject: [PATCH] --- yaml --- r: 253405 b: refs/heads/master c: 264524d5e5195f6e0f099bee20253a22b651e272 h: refs/heads/master i: 253403: fb04f766e3f9b7d203f95bb4d631beadef77eaf8 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 17f74cc41834..7b64766d888a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6407d74c5106bb362b4087693688afd34942b094 +refs/heads/master: 264524d5e5195f6e0f099bee20253a22b651e272 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 1af6cb27f67a..a54c9f87ddbb 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -6178,6 +6178,11 @@ static int dev_cpu_callback(struct notifier_block *nfb, oldsd->output_queue = NULL; oldsd->output_queue_tailp = &oldsd->output_queue; } + /* Append NAPI poll list from offline CPU. */ + if (!list_empty(&oldsd->poll_list)) { + list_splice_init(&oldsd->poll_list, &sd->poll_list); + raise_softirq_irqoff(NET_RX_SOFTIRQ); + } raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_enable();