tun_get_tx_ring and tap_get_ptr_ring no longer have in-tree consumers and can be dropped. Co-developed-by: Tim Gebauer Signed-off-by: Tim Gebauer Co-developed by: Jon Kohler Signed-off-by: Jon Kohler Signed-off-by: Simon Schippers --- drivers/net/tap.c | 13 ------------- drivers/net/tun.c | 13 ------------- include/linux/if_tap.h | 5 ----- include/linux/if_tun.h | 6 ------ 4 files changed, 37 deletions(-) diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 2847db4e3cc7..fd87db829913 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -1270,19 +1270,6 @@ struct socket *tap_get_socket(struct file *file) } EXPORT_SYMBOL_GPL(tap_get_socket); -struct ptr_ring *tap_get_ptr_ring(struct file *file) -{ - struct tap_queue *q; - - if (file->f_op != &tap_fops) - return ERR_PTR(-EINVAL); - q = file->private_data; - if (!q) - return ERR_PTR(-EBADFD); - return &q->ring; -} -EXPORT_SYMBOL_GPL(tap_get_ptr_ring); - bool tap_is_tap_file(struct file *file) { struct tap_queue *q; diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 9da6e794a80f..32f53e31a5a7 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -3843,19 +3843,6 @@ void tun_ring_unconsume(struct file *file, void **batch, int n, } EXPORT_SYMBOL_GPL(tun_ring_unconsume); -struct ptr_ring *tun_get_tx_ring(struct file *file) -{ - struct tun_file *tfile; - - if (file->f_op != &tun_fops) - return ERR_PTR(-EINVAL); - tfile = file->private_data; - if (!tfile) - return ERR_PTR(-EBADFD); - return &tfile->tx_ring; -} -EXPORT_SYMBOL_GPL(tun_get_tx_ring); - bool tun_is_tun_file(struct file *file) { struct tun_file *tfile; diff --git a/include/linux/if_tap.h b/include/linux/if_tap.h index 14194342b784..0e427b979c11 100644 --- a/include/linux/if_tap.h +++ b/include/linux/if_tap.h @@ -10,7 +10,6 @@ struct socket; #if IS_ENABLED(CONFIG_TAP) struct socket *tap_get_socket(struct file *); -struct ptr_ring *tap_get_ptr_ring(struct file *file); int tap_ring_consume_batched(struct file *file, void **array, int n); void tap_ring_unconsume(struct file *file, void **batch, int n, void (*destroy)(void *)); @@ -22,10 +21,6 @@ static inline struct socket *tap_get_socket(struct file *f) { return ERR_PTR(-EINVAL); } -static inline struct ptr_ring *tap_get_ptr_ring(struct file *f) -{ - return ERR_PTR(-EINVAL); -} static inline int tap_ring_consume_batched(struct file *f, void **array, int n) { diff --git a/include/linux/if_tun.h b/include/linux/if_tun.h index 0910c6dbac20..80b734173a80 100644 --- a/include/linux/if_tun.h +++ b/include/linux/if_tun.h @@ -21,7 +21,6 @@ struct tun_msg_ctl { #if defined(CONFIG_TUN) || defined(CONFIG_TUN_MODULE) struct socket *tun_get_socket(struct file *); -struct ptr_ring *tun_get_tx_ring(struct file *file); int tun_ring_consume_batched(struct file *file, void **array, int n); void tun_ring_unconsume(struct file *file, void **batch, int n, void (*destroy)(void *)); @@ -54,11 +53,6 @@ static inline struct socket *tun_get_socket(struct file *f) return ERR_PTR(-EINVAL); } -static inline struct ptr_ring *tun_get_tx_ring(struct file *f) -{ - return ERR_PTR(-EINVAL); -} - static inline int tun_ring_consume_batched(struct file *file, void **array, int n) { -- 2.43.0