diff options
| author | Bart De Schuymer <bdschuym@pandora.be> | 2002-09-11 19:56:17 +0000 |
|---|---|---|
| committer | Bart De Schuymer <bdschuym@pandora.be> | 2002-09-11 19:56:17 +0000 |
| commit | 92c647ce589cba24e49d2ac33627512aa9828067 (patch) | |
| tree | 858f193afa7663743061990585eec067871e33f8 /kernel/linux2.5 | |
| parent | fb03f011375fe38fa66a73d22f26a0151deba9fc (diff) | |
update to 2.5.34
Diffstat (limited to 'kernel/linux2.5')
| -rw-r--r-- | kernel/linux2.5/net/Config.in | 3 | ||||
| -rw-r--r-- | kernel/linux2.5/net/core/dev.c | 13 |
2 files changed, 10 insertions, 6 deletions
diff --git a/kernel/linux2.5/net/Config.in b/kernel/linux2.5/net/Config.in index 8578110..47a086a 100644 --- a/kernel/linux2.5/net/Config.in +++ b/kernel/linux2.5/net/Config.in @@ -26,6 +26,9 @@ if [ "$CONFIG_INET" = "y" ]; then source net/ipv6/Config.in fi fi + if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then + source net/sctp/Config.in + fi fi if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then bool 'Asynchronous Transfer Mode (ATM) (EXPERIMENTAL)' CONFIG_ATM diff --git a/kernel/linux2.5/net/core/dev.c b/kernel/linux2.5/net/core/dev.c index e5d9d21..6988fb9 100644 --- a/kernel/linux2.5/net/core/dev.c +++ b/kernel/linux2.5/net/core/dev.c @@ -1229,19 +1229,20 @@ static void sample_queue(unsigned long dummy) int netif_rx(struct sk_buff *skb) { - int this_cpu = smp_processor_id(); + int this_cpu; struct softnet_data *queue; unsigned long flags; if (!skb->stamp.tv_sec) do_gettimeofday(&skb->stamp); - /* The code is rearranged so that the path is the most - short when CPU is congested, but is still operating. + /* + * The code is rearranged so that the path is the most + * short when CPU is congested, but is still operating. */ - queue = &softnet_data[this_cpu]; - local_irq_save(flags); + this_cpu = smp_processor_id(); + queue = &softnet_data[this_cpu]; netdev_rx_stat[this_cpu].total++; if (queue->input_pkt_queue.qlen <= netdev_max_backlog) { @@ -1252,10 +1253,10 @@ int netif_rx(struct sk_buff *skb) enqueue: dev_hold(skb->dev); __skb_queue_tail(&queue->input_pkt_queue, skb); - local_irq_restore(flags); #ifndef OFFLINE_SAMPLE get_sample_stats(this_cpu); #endif + local_irq_restore(flags); return queue->cng_level; } |