|
Line
Link Here
|
|
SET_ETHTOOL_OPS(dev, &rtl8168_ethtool_ops); |
|
SET_ETHTOOL_OPS(dev, &rtl8168_ethtool_ops); |
| 1 |
^ |
1 |
^ |
| 2 |
PREPARE_DELAYED_WORK(&tp->task, task); |
2 |
PREPARE_DELAYED_WORK(&tp->task, task); |
| 3 |
^ |
3 |
^ |
| 4 |
-- r8168-8.038.00/src/r8168_n.c.orig |
4 |
++ r8168-8.038.00/src/r8168_n.c |
|
Lines 17542-17548
rtl8168_init_one(struct pci_dev *pdev,
Link Here
|
| 17542 |
|
17542 |
|
| 17543 |
RTL_NET_DEVICE_OPS(rtl8168_netdev_ops); |
17543 |
RTL_NET_DEVICE_OPS(rtl8168_netdev_ops); |
| 17544 |
|
17544 |
|
|
|
17545 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0) |
| 17545 |
SET_ETHTOOL_OPS(dev, &rtl8168_ethtool_ops); |
17546 |
SET_ETHTOOL_OPS(dev, &rtl8168_ethtool_ops); |
|
|
17547 |
#else |
| 17548 |
dev->ethtool_ops = &rtl8168_ethtool_ops; |
| 17549 |
#endif |
| 17546 |
|
17550 |
|
| 17547 |
dev->watchdog_timeo = RTL8168_TX_TIMEOUT; |
17551 |
dev->watchdog_timeo = RTL8168_TX_TIMEOUT; |
| 17548 |
dev->irq = pdev->irq; |
17552 |
dev->irq = pdev->irq; |
|
Lines 19119-19125
static void rtl8168_schedule_work(struct
Link Here
|
| 19119 |
{ |
19123 |
{ |
| 19120 |
struct rtl8168_private *tp = netdev_priv(dev); |
19124 |
struct rtl8168_private *tp = netdev_priv(dev); |
| 19121 |
|
19125 |
|
|
|
19126 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(3,15,0) |
| 19122 |
PREPARE_DELAYED_WORK(&tp->task, task); |
19127 |
PREPARE_DELAYED_WORK(&tp->task, task); |
|
|
19128 |
#else |
| 19129 |
INIT_DELAYED_WORK(&tp->task, task); |
| 19130 |
#endif |
| 19123 |
schedule_delayed_work(&tp->task, 4); |
19131 |
schedule_delayed_work(&tp->task, 4); |
| 19124 |
} |
19132 |
} |
| 19125 |
#endif |
19133 |
#endif |
