diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-15 02:24:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-15 02:24:53 -0400 |
| commit | d4b80afbba49e968623330f1336da8c724da8aad (patch) | |
| tree | a9478bd77d8b001a6a7119328d34e9666d7bfe93 /include/linux/netdevice.h | |
| parent | fcd709ef20a9d83bdb7524d27cd6719dac8690a0 (diff) | |
| parent | 4cea8776571b18db7485930cb422faa739580c8c (diff) | |
Merge branch 'linus' into x86/asm, to pick up recent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 3a788bf0affd..e8d79d4ebcfe 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -3267,6 +3267,7 @@ static inline void napi_free_frags(struct napi_struct *napi) | |||
| 3267 | napi->skb = NULL; | 3267 | napi->skb = NULL; |
| 3268 | } | 3268 | } |
| 3269 | 3269 | ||
| 3270 | bool netdev_is_rx_handler_busy(struct net_device *dev); | ||
| 3270 | int netdev_rx_handler_register(struct net_device *dev, | 3271 | int netdev_rx_handler_register(struct net_device *dev, |
| 3271 | rx_handler_func_t *rx_handler, | 3272 | rx_handler_func_t *rx_handler, |
| 3272 | void *rx_handler_data); | 3273 | void *rx_handler_data); |