summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-11 22:48:14 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-11 22:48:14 -0500
commit06d61cbf7c2522f43c09d5bb050acd0bd31812c0 (patch)
tree2ce1fb910566961de2d2ff1f2f01a9c0546d8092 /include/linux
parent34afd638d0b0698e66b6aa4f749face019a3e90f (diff)
parentd0bbccfa3297d3ef6ae4691585abde9a6c26b186 (diff)
downloadblackbird-op-linux-06d61cbf7c2522f43c09d5bb050acd0bd31812c0.tar.gz
blackbird-op-linux-06d61cbf7c2522f43c09d5bb050acd0bd31812c0.zip
Merge branch 'sky2'
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/netdevice.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 936f8b76114e..97bbca6b2960 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -802,11 +802,15 @@ static inline u32 netif_msg_init(int debug_value, int default_msg_enable_bits)
}
/* Schedule rx intr now? */
+static inline int netif_rx_schedule_test(struct net_device *dev)
+{
+ return !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
+}
+/* Schedule only if device is up */
static inline int netif_rx_schedule_prep(struct net_device *dev)
{
- return netif_running(dev) &&
- !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
+ return netif_running(dev) && netif_rx_schedule_test(dev);
}
/* Add interface to tail of rx poll list. This assumes that _prep has
OpenPOWER on IntegriCloud