diff options
| author | Jason Wang <jasowang@redhat.com> | 2018-01-04 11:14:27 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-09 10:56:10 -0500 |
| commit | 5990a30510ed1c37a769d3a035ad2d030b843528 (patch) | |
| tree | 58dd7f60299879be878882f3ccaa4fed164e6665 /include/linux/if_tap.h | |
| parent | a0ce093180f2bbb832b3f5583adc640ad67ea568 (diff) | |
tun/tap: use ptr_ring instead of skb_array
This patch switches to use ptr_ring instead of skb_array. This will be
used to enqueue different types of pointers by encoding type into
lower bits.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/if_tap.h')
| -rw-r--r-- | include/linux/if_tap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/if_tap.h b/include/linux/if_tap.h index 3ecef57c31e3..8e66866c11be 100644 --- a/include/linux/if_tap.h +++ b/include/linux/if_tap.h @@ -4,7 +4,7 @@ #if IS_ENABLED(CONFIG_TAP) struct socket *tap_get_socket(struct file *); -struct skb_array *tap_get_skb_array(struct file *file); +struct ptr_ring *tap_get_ptr_ring(struct file *file); #else #include <linux/err.h> #include <linux/errno.h> @@ -14,7 +14,7 @@ static inline struct socket *tap_get_socket(struct file *f) { return ERR_PTR(-EINVAL); } -static inline struct skb_array *tap_get_skb_array(struct file *f) +static inline struct ptr_ring *tap_get_ptr_ring(struct file *f) { return ERR_PTR(-EINVAL); } @@ -70,7 +70,7 @@ struct tap_queue { u16 queue_index; bool enabled; struct list_head next; - struct skb_array skb_array; + struct ptr_ring ring; }; rx_handler_result_t tap_handle_frame(struct sk_buff **pskb); |