summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2010-06-10 16:12:49 +0000
committerDavid S. Miller <davem@davemloft.net>2010-06-15 10:58:40 -0700
commitc18370f5b2949d9cca519355f33690b75e1e7c8b (patch)
tree8e3a2e741bacf9121d2f2b4351d3e8efb640c818 /include
parent8fdd95ec162a8fbac7f41d6f54f90402fe3e8cb1 (diff)
downloadop-kernel-dev-c18370f5b2949d9cca519355f33690b75e1e7c8b.zip
op-kernel-dev-c18370f5b2949d9cca519355f33690b75e1e7c8b.tar.gz
netpoll: Add netpoll_tx_running
This patch adds the helper netpoll_tx_running for use within ndo_start_xmit. It returns non-zero if ndo_start_xmit is being invoked by netpoll, and zero otherwise. This is currently implemented by simply looking at the hardirq count. This is because for all non-netpoll uses of ndo_start_xmit, IRQs must be enabled while netpoll always disables IRQs before calling ndo_start_xmit. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/netpoll.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index f3ad74a..4c77fe7 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -116,6 +116,11 @@ static inline void netpoll_poll_unlock(void *have)
}
}
+static inline int netpoll_tx_running(struct net_device *dev)
+{
+ return irqs_disabled();
+}
+
#else
static inline int netpoll_rx(struct sk_buff *skb)
{
@@ -139,6 +144,10 @@ static inline void netpoll_poll_unlock(void *have)
static inline void netpoll_netdev_init(struct net_device *dev)
{
}
+static inline int netpoll_tx_running(struct net_device *dev)
+{
+ return 0;
+}
#endif
#endif
OpenPOWER on IntegriCloud