From 5763a32e962eeeedb270080a6b082ab94c872d47 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 27 Feb 2017 14:07:22 -0800 Subject: data: transition to skb_reset_tc for 4.11 Signed-off-by: Jason A. Donenfeld --- src/compat/compat.h | 10 ++++++++++ src/data.c | 4 +--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/compat/compat.h b/src/compat/compat.h index 277e7e7..c3b4289 100644 --- a/src/compat/compat.h +++ b/src/compat/compat.h @@ -161,6 +161,16 @@ static inline bool ipv6_mod_enabled(void) } #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) +#include +static inline void skb_reset_tc(struct sk_buff *skb) +{ +#ifdef CONFIG_NET_CLS_ACT + skb->tc_verd = 0; +#endif +} +#endif + /* https://lkml.org/lkml/2015/6/12/415 */ #include static inline struct net_device *netdev_pub(void *dev) diff --git a/src/data.c b/src/data.c index 6cc6ce4..e91b150 100644 --- a/src/data.c +++ b/src/data.c @@ -124,9 +124,7 @@ static inline void skb_reset(struct sk_buff *skb) skb->dev = NULL; #ifdef CONFIG_NET_SCHED skb->tc_index = 0; -#ifdef CONFIG_NET_CLS_ACT - skb->tc_verd = 0; -#endif + skb_reset_tc(skb); #endif skb->hdr_len = skb_headroom(skb); skb_reset_mac_header(skb); -- cgit v1.2.3