patch-2.3.47 linux/include/net/pkt_sched.h

• Lines: 38
• Date: Sun Feb 20 20:49:03 2000
• Orig file: v2.3.46/linux/include/net/pkt_sched.h
• Orig date: Thu Feb 10 17:11:23 2000

diff -u --recursive --new-file v2.3.46/linux/include/net/pkt_sched.h linux/include/net/pkt_sched.h
@@ -7,9 +7,14 @@
 
 #define PSCHED_CLOCK_SOURCE	PSCHED_JIFFIES
 
+#include <linux/config.h>
 #include <linux/pkt_sched.h>
 #include <net/pkt_cls.h>
 
+#ifdef CONFIG_X86_TSC
+#include <asm/msr.h>
+#endif
+
 struct rtattr;
 struct Qdisc;
 
@@ -247,11 +252,11 @@
 
 #define PSCHED_US2JIFFIE(delay) (((delay)+psched_clock_per_hz-1)/psched_clock_per_hz)
 
-#if CPU == 586 || CPU == 686
+#ifdef CONFIG_X86_TSC
 
 #define PSCHED_GET_TIME(stamp) \
 ({ u64 __cur; \
-   __asm__ __volatile__ (".byte 0x0f,0x31" :"=A" (__cur)); \
+   rdtscll(__cur); \
    (stamp) = __cur>>psched_clock_scale; \
 })
 
@@ -430,7 +435,7 @@
 
 extern __inline__ void qdisc_run(struct net_device *dev)
 {
-	while (!test_bit(LINK_STATE_XOFF, &dev->state) &&
+	while (!netif_queue_stopped(dev) &&
 	       qdisc_restart(dev)<0)
 		/* NOTHING */;
 }