@@ -64,7 +64,6 @@
#include <net/xdp.h>
#include <linux/seq_file.h>
#include <linux/uio.h>
-#include <linux/skb_array.h>
#include <linux/bpf.h>
#include <linux/bpf_trace.h>
#include <linux/mutex.h>
@@ -249,24 +248,6 @@ struct veth {
__be16 h_vlan_TCI;
};
-bool tun_is_xdp_frame(void *ptr)
-{
- return (unsigned long)ptr & TUN_XDP_FLAG;
-}
-EXPORT_SYMBOL(tun_is_xdp_frame);
-
-void *tun_xdp_to_ptr(void *ptr)
-{
- return (void *)((unsigned long)ptr | TUN_XDP_FLAG);
-}
-EXPORT_SYMBOL(tun_xdp_to_ptr);
-
-void *tun_ptr_to_xdp(void *ptr)
-{
- return (void *)((unsigned long)ptr & ~TUN_XDP_FLAG);
-}
-EXPORT_SYMBOL(tun_ptr_to_xdp);
-
static int tun_napi_receive(struct napi_struct *napi, int budget)
{
struct tun_file *tfile = container_of(napi, struct tun_file, napi);
@@ -649,20 +630,6 @@ static struct tun_struct *tun_enable_queue(struct tun_file *tfile)
return tun;
}
-void tun_ptr_free(void *ptr)
-{
- if (!ptr)
- return;
- if (tun_is_xdp_frame(ptr)) {
- struct xdp_frame *xdpf = tun_ptr_to_xdp(ptr);
-
- xdp_return_frame(xdpf);
- } else {
- __skb_array_destroy_skb(ptr);
- }
-}
-EXPORT_SYMBOL_GPL(tun_ptr_free);
-
static void tun_queue_purge(struct tun_file *tfile)
{
void *ptr;
@@ -6,6 +6,7 @@
#ifndef __IF_TUN_H
#define __IF_TUN_H
+#include <linux/skb_array.h>
#include <uapi/linux/if_tun.h>
#include <uapi/linux/virtio_net.h>
@@ -27,10 +28,35 @@ struct tun_xdp_hdr {
#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);
-bool tun_is_xdp_frame(void *ptr);
-void *tun_xdp_to_ptr(void *ptr);
-void *tun_ptr_to_xdp(void *ptr);
-void tun_ptr_free(void *ptr);
+
+static inline bool tun_is_xdp_frame(void *ptr)
+{
+ return (unsigned long)ptr & TUN_XDP_FLAG;
+}
+
+static inline void *tun_xdp_to_ptr(void *ptr)
+{
+ return (void *)((unsigned long)ptr | TUN_XDP_FLAG);
+}
+
+static inline void *tun_ptr_to_xdp(void *ptr)
+{
+ return (void *)((unsigned long)ptr & ~TUN_XDP_FLAG);
+}
+
+static inline void tun_ptr_free(void *ptr)
+{
+ if (!ptr)
+ return;
+ if (tun_is_xdp_frame(ptr)) {
+ struct xdp_frame *xdpf = tun_ptr_to_xdp(ptr);
+
+ xdp_return_frame(xdpf);
+ } else {
+ __skb_array_destroy_skb(ptr);
+ }
+}
+
#else
#include <linux/err.h>
#include <linux/errno.h>