diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:14:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:14:29 -0800 |
| commit | 70a8be476e663526c3cb17a157c17ccf4fca5bd4 (patch) | |
| tree | 9cb7529d5c1d7e7d90a21b1a6c9f6133fbbb0511 /net/core/dev.c | |
| parent | 1c3cefa582a6b598d204bad02676df300e457efa (diff) | |
v2.4.9.5 -> v2.4.9.6
- Jens Axboe: remove trivially dead io_request_lock usage
- Andrea Arcangeli: softirq cleanup and ARM fixes. Slab cleanups
- Christoph Hellwig: gendisk handling helper functions/cleanups
- Nikita Danilov: reiserfs dead code pruning
- Anton Altaparmakov: NTFS update to 1.1.18
- firestream network driver: patch reverted on authors request
- NIIBE Yutaka: SH architecture update
- Paul Mackerras: PPC cleanups, PPC8xx update.
- me: reverse broken bootdata allocation patch that went into pre5
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 6d87f2182136..b3a91ffd0881 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1217,10 +1217,9 @@ int netif_rx(struct sk_buff *skb) enqueue: dev_hold(skb->dev); __skb_queue_tail(&queue->input_pkt_queue,skb); - local_irq_restore(flags); - /* Runs from irqs or BH's, no need to wake BH */ __cpu_raise_softirq(this_cpu, NET_RX_SOFTIRQ); + local_irq_restore(flags); #ifndef OFFLINE_SAMPLE get_sample_stats(this_cpu); #endif @@ -1529,10 +1528,9 @@ softnet_break: local_irq_disable(); netdev_rx_stat[this_cpu].time_squeeze++; - local_irq_enable(); - /* This already runs in BH context, no need to wake up BH's */ __cpu_raise_softirq(this_cpu, NET_RX_SOFTIRQ); + local_irq_enable(); NET_PROFILE_LEAVE(softnet_process); return; |