summarylogtreecommitdiffstats
path: root/linux-4.7.patch
blob: 6ef62d02d2ed3b7177539a3b0785d5689f3cb311 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
--- r8168-8.042.00/src/r8168_n.c.orig	2016-08-01 21:20:42.000000000 +0200
+++ r8168-8.042.00/src/r8168_n.c	2016-08-01 21:32:49.488072441 +0200
@@ -22800,7 +22800,9 @@
                         dev->hw_features &= ~NETIF_F_IPV6_CSUM;
                         netif_set_gso_max_size(dev, LSO_32K);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
                         dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
+#endif
                         dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO_64K;
 #endif
                 } else {
@@ -22808,7 +22810,9 @@
                         dev->features |=  NETIF_F_IPV6_CSUM | NETIF_F_TSO6;
                         netif_set_gso_max_size(dev, LSO_64K);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
                         dev->gso_min_segs = NIC_MIN_PHYS_BUF_COUNT;
+#endif
                         dev->gso_max_segs = NIC_MAX_PHYS_BUF_COUNT_LSO2;
 #endif
                 }
@@ -24970,7 +24974,11 @@
         wmb();
         txd->opts1 = cpu_to_le32(opts1);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,7,0)
         dev->trans_start = jiffies;
+#else
+        netif_trans_update(dev);
+#endif
 
         tp->cur_tx += frags + 1;