From 0c294ba2dc2db66a04ced9a140945b974f7a8293 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 10 Jun 2010 16:12:49 +0000
Subject: [PATCH] --- yaml --- r: 202927 b: refs/heads/master c:
 c18370f5b2949d9cca519355f33690b75e1e7c8b h: refs/heads/master i:   202925:
 b82bff41e9ee2ed6641c5b59b97a9286c81308f3   202923:
 73c42a8e7300c45e1a614fba620710b87becd113   202919:
 16297dec288ed13df3c2eb62e92c4eb9b03dc418   202911:
 f5c3e357094354b0fd6f81511ebdb2473de1e6c5 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/netpoll.h | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 10853295d43c..1900c580c4a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fdd95ec162a8fbac7f41d6f54f90402fe3e8cb1
+refs/heads/master: c18370f5b2949d9cca519355f33690b75e1e7c8b
diff --git a/trunk/include/linux/netpoll.h b/trunk/include/linux/netpoll.h
index f3ad74af7e1f..4c77fe78ceff 100644
--- a/trunk/include/linux/netpoll.h
+++ b/trunk/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