From 43963958c7e818344d26a6168b55ad62cb975e0c Mon Sep 17 00:00:00 2001 From: Vladimir Ulrich Date: Mon, 10 Apr 2017 03:34:40 +0300 Subject: [PATCH] [net/siit] Added compability for Linux >= 4.7.0 Closes #4242 Signed-off-by: Vladimir Ulrich --- net/siit/Makefile | 4 ++-- net/siit/src/siit.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/net/siit/Makefile b/net/siit/Makefile index a2a4c50577..c1f5a41074 100644 --- a/net/siit/Makefile +++ b/net/siit/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2015 OpenWrt.org +# Copyright (C) 2006-2017 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=siit PKG_VERSION:=1.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPLv2+ include $(INCLUDE_DIR)/package.mk diff --git a/net/siit/src/siit.c b/net/siit/src/siit.c index ea68b74512..55668353a6 100644 --- a/net/siit/src/siit.c +++ b/net/siit/src/siit.c @@ -1166,7 +1166,11 @@ static int siit_xmit(struct sk_buff *skb, struct net_device *dev) siit_stats(dev)->rx_bytes += skb->len; siit_stats(dev)->rx_packets++; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) + netif_trans_update(dev); +#else dev->trans_start = jiffies; +#endif /* Upper layer (IP) protocol forms sk_buff for outgoing packet * and sets IP header + Ether header too. IP layer sets outgoing