diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-09 12:03:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-09 12:03:00 -0500 |
| commit | bcf34adc105d946437da3a575df3b390493e9078 (patch) | |
| tree | c0d48a1da4ce356c2ce2037ba1b4fc210abba7e6 /include/linux | |
| parent | d06cbe9cbb8905df21b11d1cf789c9b2947688e9 (diff) | |
| parent | 3a4030761ea88ff439030ca98e3094b9900e96b7 (diff) | |
| download | cachepc-linux-bcf34adc105d946437da3a575df3b390493e9078.tar.gz cachepc-linux-bcf34adc105d946437da3a575df3b390493e9078.zip | |
Merge branch 'vhost_net-ptr_ring-fixes'
Jason Wang says:
====================
Several fixes for vhost_net ptr_ring usage
This small series try to fix several bugs of ptr_ring usage in
vhost_net. Please review.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_tun.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index c5b0a75a7812..fd00170b494f 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h @@ -25,6 +25,7 @@ struct ptr_ring *tun_get_tx_ring(struct file *file); bool tun_is_xdp_buff(void *ptr); void *tun_xdp_to_ptr(void *ptr); void *tun_ptr_to_xdp(void *ptr); +void tun_ptr_free(void *ptr); #else #include <linux/err.h> #include <linux/errno.h> @@ -50,5 +51,8 @@ static inline void *tun_ptr_to_xdp(void *ptr) { return NULL; } +static inline void tun_ptr_free(void *ptr) +{ +} #endif /* CONFIG_TUN */ #endif /* __IF_TUN_H */ |