diff options
| -rw-r--r-- | pfinet/ChangeLog | 6 | ||||
| -rw-r--r-- | pfinet/linux-src/net/core/dev.c | 10 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pfinet/ChangeLog b/pfinet/ChangeLog index 4266edce..f8a09d00 100644 --- a/pfinet/ChangeLog +++ b/pfinet/ChangeLog @@ -1,3 +1,9 @@ +2000-07-26 Mark Kettenis <kettenis@gnu.org> + + * linux-src/net/core/dev.c (net_bh) [_HURD_]: Leave out the code + that gives other bottom halves a chance to run; the network bottom + half is the only one present in pfinet. + 2000-04-03 Roland McGrath <roland@baalperazim.frob.com> * glue-include/asm/byteorder.h: Include <hurd.h> early on, diff --git a/pfinet/linux-src/net/core/dev.c b/pfinet/linux-src/net/core/dev.c index 7175dec6..aaee35a2 100644 --- a/pfinet/linux-src/net/core/dev.c +++ b/pfinet/linux-src/net/core/dev.c @@ -837,6 +837,7 @@ void net_bh(void) struct packet_type *ptype; struct packet_type *pt_prev; unsigned short type; +#ifndef _HURD_ unsigned long start_time = jiffies; #ifdef CONFIG_CPU_IS_SLOW static unsigned long start_busy = 0; @@ -846,6 +847,7 @@ void net_bh(void) start_busy = start_time; net_cpu_congestion = ave_busy>>8; #endif +#endif NET_PROFILE_ENTER(net_bh); /* @@ -876,15 +878,18 @@ void net_bh(void) { struct sk_buff * skb; +#ifndef _HURD_ /* Give chance to other bottom halves to run */ if (jiffies - start_time > 1) goto net_bh_break; +#endif /* * We have a packet. Therefore the queue has shrunk */ skb = skb_dequeue(&backlog); +#ifndef _HURD_ #ifdef CONFIG_CPU_IS_SLOW if (ave_busy > 128*16) { kfree_skb(skb); @@ -893,6 +898,7 @@ void net_bh(void) break; } #endif +#endif #if 0 @@ -1009,6 +1015,7 @@ void net_bh(void) if (qdisc_head.forw != &qdisc_head) qdisc_run_queues(); +#ifndef _HURD_ #ifdef CONFIG_CPU_IS_SLOW if (1) { unsigned long start_idle = jiffies; @@ -1016,6 +1023,7 @@ void net_bh(void) start_busy = 0; } #endif +#endif #ifdef CONFIG_NET_HW_FLOWCONTROL if (netdev_dropping) netdev_wakeup(); @@ -1025,10 +1033,12 @@ void net_bh(void) NET_PROFILE_LEAVE(net_bh); return; +#ifndef _HURD_ net_bh_break: mark_bh(NET_BH); NET_PROFILE_LEAVE(net_bh); return; +#endif } /* Protocol dependent address dumping routines */ |