summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 14:31:08 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 14:31:08 -0700
commit2e27afb300b56d83bb03fbfa68852b9c1e2920c6 (patch)
tree32e38acc1602042260f13cceaf3a29792affb05b /net
parentc2dc1ad582196208a2f990eb0230eb922046c684 (diff)
downloadop-kernel-dev-2e27afb300b56d83bb03fbfa68852b9c1e2920c6.zip
op-kernel-dev-2e27afb300b56d83bb03fbfa68852b9c1e2920c6.tar.gz
Revert "[NET]: Fix races in net_rx_action vs netpoll."
This reverts commit 29578624e354f56143d92510fff33a8b2aaa2c03. Ingo Molnar reports complete breakage with his e1000 card (no networking, card reports transmit timeouts), and bisected it down to this commit. Let's figure out what went wrong, but not keep breaking machines until we do. Cc: Ingo Molnar <mingo@elte.hu> Cc: Olaf Kirch <olaf.kirch@oracle.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/core/netpoll.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index d1264e9..de1b26a 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -124,13 +124,6 @@ static void poll_napi(struct netpoll *np)
if (test_bit(__LINK_STATE_RX_SCHED, &np->dev->state) &&
npinfo->poll_owner != smp_processor_id() &&
spin_trylock(&npinfo->poll_lock)) {
- /* When calling dev->poll from poll_napi, we may end up in
- * netif_rx_complete. However, only the CPU to which the
- * device was queued is allowed to remove it from poll_list.
- * Setting POLL_LIST_FROZEN tells netif_rx_complete
- * to leave the NAPI state alone.
- */
- set_bit(__LINK_STATE_POLL_LIST_FROZEN, &np->dev->state);
npinfo->rx_flags |= NETPOLL_RX_DROP;
atomic_inc(&trapped);
@@ -138,7 +131,6 @@ static void poll_napi(struct netpoll *np)
atomic_dec(&trapped);
npinfo->rx_flags &= ~NETPOLL_RX_DROP;
- clear_bit(__LINK_STATE_POLL_LIST_FROZEN, &np->dev->state);
spin_unlock(&npinfo->poll_lock);
}
}
OpenPOWER on IntegriCloud