diff options
Diffstat (limited to 'include/linux/netpoll.h')
| -rw-r--r-- | include/linux/netpoll.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index 154f9776056c..ab9aaaff8d04 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h | |||
| @@ -65,8 +65,6 @@ void netpoll_print_options(struct netpoll *np); | |||
| 65 | int netpoll_parse_options(struct netpoll *np, char *opt); | 65 | int netpoll_parse_options(struct netpoll *np, char *opt); |
| 66 | int __netpoll_setup(struct netpoll *np, struct net_device *ndev, gfp_t gfp); | 66 | int __netpoll_setup(struct netpoll *np, struct net_device *ndev, gfp_t gfp); |
| 67 | int netpoll_setup(struct netpoll *np); | 67 | int netpoll_setup(struct netpoll *np); |
| 68 | int netpoll_trap(void); | ||
| 69 | void netpoll_set_trap(int trap); | ||
| 70 | void __netpoll_cleanup(struct netpoll *np); | 68 | void __netpoll_cleanup(struct netpoll *np); |
| 71 | void __netpoll_free_async(struct netpoll *np); | 69 | void __netpoll_free_async(struct netpoll *np); |
| 72 | void netpoll_cleanup(struct netpoll *np); | 70 | void netpoll_cleanup(struct netpoll *np); |
| @@ -82,11 +80,20 @@ static inline void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb) | |||
| 82 | } | 80 | } |
| 83 | 81 | ||
| 84 | #ifdef CONFIG_NETPOLL_TRAP | 82 | #ifdef CONFIG_NETPOLL_TRAP |
| 83 | int netpoll_trap(void); | ||
| 84 | void netpoll_set_trap(int trap); | ||
| 85 | static inline bool netpoll_rx_processing(struct netpoll_info *npinfo) | 85 | static inline bool netpoll_rx_processing(struct netpoll_info *npinfo) |
| 86 | { | 86 | { |
| 87 | return !list_empty(&npinfo->rx_np); | 87 | return !list_empty(&npinfo->rx_np); |
| 88 | } | 88 | } |
| 89 | #else | 89 | #else |
| 90 | static inline int netpoll_trap(void) | ||
| 91 | { | ||
| 92 | return 0; | ||
| 93 | } | ||
| 94 | static inline void netpoll_set_trap(int trap) | ||
| 95 | { | ||
| 96 | } | ||
| 90 | static inline bool netpoll_rx_processing(struct netpoll_info *npinfo) | 97 | static inline bool netpoll_rx_processing(struct netpoll_info *npinfo) |
| 91 | { | 98 | { |
| 92 | return false; | 99 | return false; |
