[net/siit] Added compability for Linux >= 4.7.0 4244/head
authorVladimir Ulrich <admin@evl.su>
Mon, 10 Apr 2017 00:34:40 +0000 (03:34 +0300)
committerVladimir Ulrich <admin@evl.su>
Mon, 10 Apr 2017 00:34:40 +0000 (03:34 +0300)
Closes #4242

Signed-off-by: Vladimir Ulrich <admin@evl.su>
net/siit/Makefile
net/siit/src/siit.c

index a2a4c50577562a4f84f849a0f270b571584e07a6..c1f5a410748d74d0c90c4c0290720323d84b3ff3 100644 (file)
@@ -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
index ea68b74512de1b51b66be073cbcc487aaceb2963..55668353a6f8ff02e62eb1f71ba5b32342f6b66b 100644 (file)
@@ -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