1 diff --git a/src/r8168_n.c b/src/r8168_n.c
\r
2 index 4cd540a..2dbb726 100755
\r
5 @@ -407,8 +407,14 @@ MODULE_VERSION(RTL8168_VERSION);
\r
6 static void rtl8168_sleep_rx_enable(struct net_device *dev);
\r
7 static void rtl8168_dsm(struct net_device *dev, int dev_state);
\r
9 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
\r
10 +static void rtl8168_esd_timer(struct timer_list *timer);
\r
11 +static void rtl8168_link_timer(struct timer_list *timer);
\r
13 static void rtl8168_esd_timer(unsigned long __opaque);
\r
14 static void rtl8168_link_timer(unsigned long __opaque);
\r
15 +#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
\r
17 static void rtl8168_tx_clear(struct rtl8168_private *tp);
\r
18 static void rtl8168_rx_clear(struct rtl8168_private *tp);
\r
20 @@ -22964,7 +22970,11 @@ static inline void rtl8168_request_esd_timer(struct net_device *dev)
\r
21 struct rtl8168_private *tp = netdev_priv(dev);
\r
22 struct timer_list *timer = &tp->esd_timer;
\r
24 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
\r
25 + timer_setup(timer, rtl8168_esd_timer, 0);
\r
27 setup_timer(timer, rtl8168_esd_timer, (unsigned long)dev);
\r
28 +#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
\r
29 mod_timer(timer, jiffies + RTL8168_ESD_TIMEOUT);
\r
32 @@ -22978,7 +22988,11 @@ static inline void rtl8168_request_link_timer(struct net_device *dev)
\r
33 struct rtl8168_private *tp = netdev_priv(dev);
\r
34 struct timer_list *timer = &tp->link_timer;
\r
36 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
\r
37 + timer_setup(timer, rtl8168_link_timer, 0);
\r
39 setup_timer(timer, rtl8168_link_timer, (unsigned long)dev);
\r
40 +#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
\r
41 mod_timer(timer, jiffies + RTL8168_LINK_TIMEOUT);
\r
44 @@ -24717,12 +24731,19 @@ err_out:
\r
45 #define PCI_DEVICE_SERIAL_NUMBER (0x0164)
\r
48 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
\r
49 +rtl8168_esd_timer(struct timer_list *timer)
\r
51 + struct rtl8168_private *tp = from_timer(tp, timer, esd_timer);
\r
52 + struct net_device *dev = tp->dev;
\r
54 rtl8168_esd_timer(unsigned long __opaque)
\r
56 struct net_device *dev = (struct net_device *)__opaque;
\r
57 struct rtl8168_private *tp = netdev_priv(dev);
\r
58 - struct pci_dev *pdev = tp->pci_dev;
\r
59 struct timer_list *timer = &tp->esd_timer;
\r
60 +#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
\r
61 + struct pci_dev *pdev = tp->pci_dev;
\r
62 unsigned long timeout = RTL8168_ESD_TIMEOUT;
\r
63 unsigned long flags;
\r
65 @@ -24856,11 +24877,18 @@ rtl8168_esd_timer(unsigned long __opaque)
\r
69 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
\r
70 +rtl8168_link_timer(struct timer_list *timer)
\r
72 + struct rtl8168_private *tp = from_timer(tp, timer, link_timer);
\r
73 + struct net_device *dev = tp->dev;
\r
75 rtl8168_link_timer(unsigned long __opaque)
\r
77 struct net_device *dev = (struct net_device *)__opaque;
\r
78 struct rtl8168_private *tp = netdev_priv(dev);
\r
79 struct timer_list *timer = &tp->link_timer;
\r
80 +#endif//LINUX_VERSION_CODE >= KERNEL_VERSION(4,15,0)
\r
81 unsigned long flags;
\r
83 spin_lock_irqsave(&tp->lock, flags);