Browse Source

Merge pull request #4244 from Wedmer/master

[net/siit] Added compability for Linux >= 4.7.0
lilik-openwrt-22.03
Hannu Nyman 8 years ago
committed by GitHub
parent
commit
ab5cb3164b
2 changed files with 6 additions and 2 deletions
  1. +2
    -2
      net/siit/Makefile
  2. +4
    -0
      net/siit/src/siit.c

+ 2
- 2
net/siit/Makefile View 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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=siit PKG_NAME:=siit
PKG_VERSION:=1.2 PKG_VERSION:=1.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=GPLv2+ PKG_LICENSE:=GPLv2+
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk


+ 4
- 0
net/siit/src/siit.c View 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_bytes += skb->len;
siit_stats(dev)->rx_packets++; siit_stats(dev)->rx_packets++;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
netif_trans_update(dev);
#else
dev->trans_start = jiffies; dev->trans_start = jiffies;
#endif
/* Upper layer (IP) protocol forms sk_buff for outgoing packet /* Upper layer (IP) protocol forms sk_buff for outgoing packet
* and sets IP header + Ether header too. IP layer sets outgoing * and sets IP header + Ether header too. IP layer sets outgoing


Loading…
Cancel
Save