chewi       15/04/16 22:48:37

  Added:                r8168-8.039.00-linux-4-compat.patch
  Log:
  Fix building against Linux 4. Not sure if he wrote it but thanks to
  Massimiliano Torromeo at Arch for the patch. Closes bug #546564.
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
9C6D7DE4)

Revision  Changes    Path
1.1                  net-misc/r8168/files/r8168-8.039.00-linux-4-compat.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/r8168/files/r8168-8.039.00-linux-4-compat.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/r8168/files/r8168-8.039.00-linux-4-compat.patch?rev=1.1&content-type=text/plain

Index: r8168-8.039.00-linux-4-compat.patch
===================================================================
diff --git a/src/r8168_n.c b/src/r8168_n.c
index 9d6f231..c4200d0 100755
--- a/src/r8168_n.c
+++ b/src/r8168_n.c
@@ -3291,6 +3291,9 @@ rtl8168_tx_vlan_tag(struct rtl8168_private *tp,
 #if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
         tag = (tp->vlgrp && vlan_tx_tag_present(skb)) ?
               TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00;
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
+        tag = (skb_vlan_tag_present(skb)) ?
+              TxVlanTag | swab16(skb_vlan_tag_get(skb)) : 0x00;
 #else
         tag = (vlan_tx_tag_present(skb)) ?
               TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00;




Reply via email to