From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 10 Aug 2010 23:24:41 +0000 (-0700)
Subject: net: make netpoll_rx return bool for !CONFIG_NETPOLL
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=969a6e521730153380ad7781095f503c040b684c;p=linux-beck.git

net: make netpoll_rx return bool for !CONFIG_NETPOLL

"netpoll: Use 'bool' for netpoll_rx() return type." missed the case when
CONFIG_NETPOLL is disabled.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 413742c92d14..791d5109f34c 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -122,7 +122,7 @@ static inline int netpoll_tx_running(struct net_device *dev)
 }
 
 #else
-static inline int netpoll_rx(struct sk_buff *skb)
+static inline bool netpoll_rx(struct sk_buff *skb)
 {
 	return 0;
 }