imported patch intel-net-driver-kcompat.patch

diff --git a/drivers/net/e1000/kcompat.h b/drivers/net/e1000/kcompat.h
index 1a53d5a14fabefc3813ea44eecfd784d91aad25d..3b8570725b95e1d46c64c8a765046f1aeca3dd90 100644 (file)
--- a/drivers/net/e1000/kcompat.h
+++ b/drivers/net/e1000/kcompat.h
@@ -1407,9 +1407,9 @@ static inline int _kc_skb_is_gso(const struct sk_buff *skb)
 #ifndef AX_RELEASE_VERSION
 #define AX_RELEASE_VERSION(a,b) 0
 #endif
-#if (!(( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,4) ) && ( RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0) ) || ( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,0) ) || (AX_RELEASE_CODE > AX_RELEASE_VERSION(3,0))))
-typedef irqreturn_t (*irq_handler_t)(int, void*, struct pt_regs *);
-#endif
+//#if (!(( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,4) ) && ( RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0) ) || ( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,0) ) || (AX_RELEASE_CODE > AX_RELEASE_VERSION(3,0))))
+//typedef irqreturn_t (*irq_handler_t)(int, void*, struct pt_regs *);
+//#endif
 typedef irqreturn_t (*new_handler_t)(int, void*);
 static inline irqreturn_t _kc_request_irq(unsigned int irq, new_handler_t handler, unsigned long flags, const char *devname, void *dev_id)
 #else /* 2.4.x */

diff --git a/drivers/net/e1000e/kcompat.h b/drivers/net/e1000e/kcompat.h
index d860f54dbde92b3224aeb7549e2f97e1edb9e95f..0dd50727430dbaaa6a8894fc010eda5e4839e841 100644 (file)
--- a/drivers/net/e1000e/kcompat.h
+++ b/drivers/net/e1000e/kcompat.h
@@ -1384,9 +1384,9 @@ static inline int _kc_skb_is_gso(const struct sk_buff *skb)
 #ifndef AX_RELEASE_VERSION
 #define AX_RELEASE_VERSION(a,b) 0
 #endif
-#if (!(( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,4) ) && ( RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0) ) || ( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,0) ) || (AX_RELEASE_CODE > AX_RELEASE_VERSION(3,0))))
-typedef irqreturn_t (*irq_handler_t)(int, void*, struct pt_regs *);
-#endif
+//#if (!(( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,4) ) && ( RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0) ) || ( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,0) ) || (AX_RELEASE_CODE > AX_RELEASE_VERSION(3,0))))
+//typedef irqreturn_t (*irq_handler_t)(int, void*, struct pt_regs *);
+//#endif
 typedef irqreturn_t (*new_handler_t)(int, void*);
 static inline irqreturn_t _kc_request_irq(unsigned int irq, new_handler_t handler, unsigned long flags, const char *devname, void *dev_id)
 #else /* 2.4.x */

diff --git a/drivers/net/igb/kcompat.h b/drivers/net/igb/kcompat.h
index 32cc976f14eb4adc4770e1737ad70a742054c3a2..9a0bb77b20fd36583966a541e8c4ce4873abd748 100644 (file)
--- a/drivers/net/igb/kcompat.h
+++ b/drivers/net/igb/kcompat.h
@@ -1345,9 +1345,9 @@ static inline int _kc_skb_is_gso(const struct sk_buff *skb)
 #ifndef AX_RELEASE_VERSION
 #define AX_RELEASE_VERSION(a,b) 0
 #endif
-#if (!(( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,4) ) && ( RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0) ) || ( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,0) ) || (AX_RELEASE_CODE > AX_RELEASE_VERSION(3,0))))
-typedef irqreturn_t (*irq_handler_t)(int, void*, struct pt_regs *);
-#endif
+//#if (!(( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,4) ) && ( RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0) ) || ( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,0) ) || (AX_RELEASE_CODE > AX_RELEASE_VERSION(3,0))))
+//typedef irqreturn_t (*irq_handler_t)(int, void*, struct pt_regs *);
+//#endif
 typedef irqreturn_t (*new_handler_t)(int, void*);
 static inline irqreturn_t _kc_request_irq(unsigned int irq, new_handler_t handler, unsigned long flags, const char *devname, void *dev_id)
 #else /* 2.4.x */

diff --git a/drivers/net/ixgb/kcompat.h b/drivers/net/ixgb/kcompat.h
index 0883509c92cfca139b89945d633349fd03c06c54..8ba46fa5cd31481cfce56b2204f44512d06a25e1 100644 (file)
--- a/drivers/net/ixgb/kcompat.h
+++ b/drivers/net/ixgb/kcompat.h
@@ -1359,9 +1359,9 @@ static inline int _kc_skb_is_gso(const struct sk_buff *skb)
 #ifndef RHEL_RELEASE_VERSION
 #define RHEL_RELEASE_VERSION(a,b) 0
 #endif
-#if (!(( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,4) ) && ( RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0) ) || ( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,0) ))) 
-typedef irqreturn_t (*irq_handler_t)(int, void*, struct pt_regs *);
-#endif
+//#if (!(( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,4) ) && ( RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0) ) || ( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,0) ))) 
+//typedef irqreturn_t (*irq_handler_t)(int, void*, struct pt_regs *);
+//#endif
 typedef irqreturn_t (*new_handler_t)(int, void*);
 static inline irqreturn_t _kc_request_irq(unsigned int irq, new_handler_t handler, unsigned long flags, const char *devname, void *dev_id)
 #else /* 2.4.x */

diff --git a/drivers/net/ixgbe/kcompat.h b/drivers/net/ixgbe/kcompat.h
index 7d05b764167a27a2b3fe688bf49bc298de121e87..9e39bed8ee25f56e8b454aaa5492dbf841727cf5 100644 (file)
--- a/drivers/net/ixgbe/kcompat.h
+++ b/drivers/net/ixgbe/kcompat.h
@@ -1391,9 +1391,9 @@ static inline int _kc_skb_is_gso(const struct sk_buff *skb)
 #ifndef AX_RELEASE_VERSION
 #define AX_RELEASE_VERSION(a,b) 0
 #endif
-#if (!(( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,4) ) && ( RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0) ) || ( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,0) ) || (AX_RELEASE_CODE > AX_RELEASE_VERSION(3,0))))
-typedef irqreturn_t (*irq_handler_t)(int, void*, struct pt_regs *);
-#endif
+//#if (!(( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(4,4) ) && ( RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(5,0) ) || ( RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(5,0) ) || (AX_RELEASE_CODE > AX_RELEASE_VERSION(3,0))))
+//typedef irqreturn_t (*irq_handler_t)(int, void*, struct pt_regs *);
+//#endif
 typedef irqreturn_t (*new_handler_t)(int, void*);
 static inline irqreturn_t _kc_request_irq(unsigned int irq, new_handler_t handler, unsigned long flags, const char *devname, void *dev_id)
 #else /* 2.4.x */