[packages/igb] - simpler fix for linux 3.15 - rel 3

[baggins]

commit 18e2833550727c2f8fde12d2627a17c3ee35f666
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Jul 12 12:51:40 2014 +0200

    - simpler fix for linux 3.15
    - rel 3

 igb.spec         |  2 +-
 linux-3.15.patch | 28 +++++-----------------------
 2 files changed, 6 insertions(+), 24 deletions(-)
---
diff --git a/igb.spec b/igb.spec
index 1f87ed2..b1825d1 100644
--- a/igb.spec
+++ b/igb.spec
@@ -21,7 +21,7 @@ exit 1
 
 %define		_duplicate_files_terminate_build	0
 
-%define		rel	2
+%define		rel	3
 %define		pname	igb
 Summary:	Intel(R) PRO/1000 driver for Linux
 Summary(pl.UTF-8):	Sterownik do karty Intel(R) PRO/1000
diff --git a/linux-3.15.patch b/linux-3.15.patch
index 9ed7f7b..a515d4a 100644
--- a/linux-3.15.patch
+++ b/linux-3.15.patch
@@ -1,33 +1,15 @@
 --- a/src/igb_main.c
 +++ b/src/igb_main.c
-@@ -7366,7 +7366,8 @@ static inline void igb_rx_hash(struct igb_ring *ring,
+@@ -7366,7 +7366,12 @@ static inline void igb_rx_hash(struct igb_ring *ring,
  			       struct sk_buff *skb)
  {
  	if (netdev_ring(ring)->features & NETIF_F_RXHASH)
--		skb->rxhash = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
++#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
+ 		skb->rxhash = le32_to_cpu(rx_desc->wb.lower.hi_dword.rss);
++#else
 +		skb_set_hash(skb, le32_to_cpu(rx_desc->wb.lower.hi_dword.rss),
 +			     PKT_HASH_TYPE_L3);
++#endif
  }
  
  #endif
---- a/src/kcompat.h
-+++ b/src/kcompat.h
-@@ -3831,4 +3831,15 @@ static inline struct sk_buff *__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,
- #define HAVE_ENCAP_TSO_OFFLOAD
- #endif /* >= 3.10.0 */
- 
-+#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
-+#ifdef NETIF_F_RXHASH
-+#define PKT_HASH_TYPE_L3 0
-+static inline void
-+skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
-+{
-+	skb->rxhash = hash;
-+}
-+#endif /* NETIF_F_RXHASH */
-+#endif /* < 3.14.0 */
-+
- #endif /* _KCOMPAT_H_ */
--- 
-1.9.1
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/igb.git/commitdiff/18e2833550727c2f8fde12d2627a17c3ee35f666