Attachment #472482 for bug #618340

View | Details | Raw Unified | Return to bug 618340
Collapse All | Expand All

Lines 36-41 Link Here

(-)a/src/r8168.h (+4 lines)
36	#include "r8168_realwow.h"	36	#include "r8168_realwow.h"
37	#include "r8168_fiber.h"	37	#include "r8168_fiber.h"
38		38
		39	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0))
		40	#include <linux/sched/signal.h>
		41	#endif
		42
39	#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)	43	#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0)
40	#if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present)	44	#if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present)
41	#define vlan_tx_tag_present skb_vlan_tag_present	45	#define vlan_tx_tag_present skb_vlan_tag_present

Lines 25732-25738 Link Here

(-)a/src/r8168_n.c (+2 lines)
25732	if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)	25732	if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
25733	rtl8168_rx_skb(tp, skb);	25733	rtl8168_rx_skb(tp, skb);
25734		25734
		25735	#if (LINUX_VERSION_CODE <= KERNEL_VERSION(4, 10, 0))
25735	dev->last_rx = jiffies;	25736	dev->last_rx = jiffies;
		25737	#endif
25736	RTLDEV->stats.rx_bytes += pkt_size;	25738	RTLDEV->stats.rx_bytes += pkt_size;
25737	RTLDEV->stats.rx_packets++;	25739	RTLDEV->stats.rx_packets++;
25738	}	25740	}

Return to bug 618340