diff options
| -rw-r--r-- | src/compat/Kbuild.include | 4 | ||||
| -rw-r--r-- | src/compat/skb_array/include/linux/skb_array.h | 11 | ||||
| -rw-r--r-- | src/queueing.c | 3 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/compat/Kbuild.include b/src/compat/Kbuild.include index 209c0cc..a0c2af7 100644 --- a/src/compat/Kbuild.include +++ b/src/compat/Kbuild.include @@ -12,6 +12,10 @@ ifeq ($(wildcard $(srctree)/include/linux/ptr_ring.h),) ccflags-y += -I$(kbuild-dir)/compat/ptr_ring/include endif +ifeq ($(wildcard $(srctree)/include/linux/skb_array.h),) +ccflags-y += -I$(kbuild-dir)/compat/skb_array/include +endif + ifeq ($(wildcard $(srctree)/include/linux/siphash.h),) ccflags-y += -I$(kbuild-dir)/compat/siphash/include wireguard-y += compat/siphash/siphash.o diff --git a/src/compat/skb_array/include/linux/skb_array.h b/src/compat/skb_array/include/linux/skb_array.h new file mode 100644 index 0000000..c91fedc --- /dev/null +++ b/src/compat/skb_array/include/linux/skb_array.h @@ -0,0 +1,11 @@ +#ifndef _WG_SKB_ARRAY_H +#define _WG_SKB_ARRAY_H + +#include <linux/skbuff.h> + +static void __skb_array_destroy_skb(void *ptr) +{ + kfree_skb(ptr); +} + +#endif diff --git a/src/queueing.c b/src/queueing.c index 1de413b..8084e74 100644 --- a/src/queueing.c +++ b/src/queueing.c @@ -4,6 +4,7 @@ */ #include "queueing.h" +#include <linux/skb_array.h> struct multicore_worker __percpu * wg_packet_percpu_multicore_worker_alloc(work_func_t function, void *ptr) @@ -42,7 +43,7 @@ void wg_packet_queue_free(struct crypt_queue *queue, bool purge) { free_percpu(queue->worker); WARN_ON(!purge && !__ptr_ring_empty(&queue->ring)); - ptr_ring_cleanup(&queue->ring, purge ? (void(*)(void*))kfree_skb : NULL); + ptr_ring_cleanup(&queue->ring, purge ? __skb_array_destroy_skb : NULL); } #define NEXT(skb) ((skb)->prev) |