diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2005-10-13 00:12:21 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-10-13 00:12:21 +0200 |
| commit | afb997c6163b33292d31a09d6aa5cbb03ffa5bf1 (patch) | |
| tree | ee88c284b220e60088934b77797f4433590bf90c /include | |
| parent | [BRIDGE]: fix race on bridge del if (diff) | |
| download | linux-afb997c6163b33292d31a09d6aa5cbb03ffa5bf1.tar.xz linux-afb997c6163b33292d31a09d6aa5cbb03ffa5bf1.zip | |
[NETPOLL]: wrong return for null netpoll_poll_lock()
When netpoll is not being used, the macro that
defines the removed routing netpoll_poll_lock
defines the return as zero, but the real
routine returns a `void *`
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netpoll.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index 5ade54a78dbb..ca5a8733000f 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h @@ -86,7 +86,7 @@ static inline void netpoll_poll_unlock(void *have) #else #define netpoll_rx(a) 0 -#define netpoll_poll_lock(a) 0 +#define netpoll_poll_lock(a) NULL #define netpoll_poll_unlock(a) #endif |