Merge lp:~homemadejam/ubuntu/saucy/r8168/fix-for-linux3.10 into lp:ubuntu/saucy/r8168

[Edb]

* kernel-3.10 patch: Fixing building the module for kernel 3.10+ which has
  NETIF_F_HW_{RX,TX} defines renamed to NETIF_F_HW_VLAN_{RX,TX}.
* also for 3.10: fixing parameters to __vlan_hwaccel_put_tag which
  now requires the protocol to be specified.
* Closes #1216906 using patch by anonymous damian posted at
  http://code.google.com/p/r8168/issues/detail?id=13

[Robie Basak (racb)]

I've commented on the bug. Since the DKMS package installs and successfully compiles on Saucy right now, it isn't clear to me what needs to be merged. Could you please clarify if this merge proposal is still relevant?

review: Needs Information

Unmerged revisions

13. By Edb on 2013-08-27

* kernel-3.10 patch: Fixing building the module for kernel 3.10+ which has
  NETIF_F_HW_{RX,TX} defines renamed to NETIF_F_HW_VLAN_{RX,TX}.
* also for 3.10: fixing parameters to __vlan_hwaccel_put_tag which
  now requires the protocol to be specified.
* Closes #1216906 using patch by anonymous damian posted at
  http://code.google.com/p/r8168/issues/detail?id=13

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-07 10:02:12 +0000
+++ debian/changelog	2013-08-27 20:06:42 +0000
@@ -1,3 +1,15 @@
+r8168 (8.035.00-2ubuntu2) UNRELEASED; urgency=medium
+
+  * kernel-3.10 patch: Fixing building the module for kernel 3.10+ which has
+    NETIF_F_HW_{RX,TX} defines renamed  to NETIF_F_HW_VLAN_{RX,TX}.
+  * also for 3.10: fixing parameters to __vlan_hwaccel_put_tag which 
+    now requires the protocol to be specified.
+  * Closes #1216906 using patch by anonymous damian posted at
+    http://code.google.com/p/r8168/issues/detail?id=13
+    
+
+ -- ed <ed@brussels>  Tue, 27 Aug 2013 20:51:52 +0100
+
 r8168 (8.035.00-2) unstable; urgency=low
 
   * kernel-3.8.patch: New, fix building the module for kernel 3.8+ that has

=== modified file 'src/r8168_n.c'
--- src/r8168_n.c	2013-05-07 10:02:12 +0000
+++ src/r8168_n.c	2013-08-27 20:06:42 +0000
@@ -53,6 +53,10 @@
 #include <linux/init.h>
 #include <linux/rtnetlink.h>
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+#include <uapi/linux/if_ether.h>
+#endif
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
 #include <linux/pci-aspm.h>
 #endif
@@ -2079,6 +2083,9 @@
 				       swab16(opts2 & 0xffff));
 		ret = 0;
 	}
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+	if (opts2 & RxVlanTag)
+		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), swab16(opts2 & 0xffff));
 #else
 	if (opts2 & RxVlanTag)
 		__vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff));
@@ -2140,7 +2147,11 @@
 	else
 		tp->cp_cmd &= ~RxChkSum;
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+	if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)
+#else
 	if (dev->features & NETIF_F_HW_VLAN_RX)
+#endif
 		tp->cp_cmd |= RxVlan;
 	else
 		tp->cp_cmd &= ~RxVlan;
@@ -15061,7 +15072,11 @@
 
 #ifdef CONFIG_R8168_VLAN
 	if (tp->mcfg != CFG_METHOD_DEFAULT) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+		dev->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
+#else
 		dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+#endif
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
 		dev->vlan_rx_kill_vid = rtl8168_vlan_rx_kill_vid;
 #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
@@ -15076,7 +15091,12 @@
 #else
 		dev->features |= NETIF_F_RXCSUM;
 		dev->hw_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+			NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;
+#else
 			NETIF_F_RXCSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;
+#endif
+
 		dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO |
 			NETIF_F_HIGHDMA;
 #endif