From b84a41a79a0ecc0eee7bef991bd32a6eae23f627 Mon Sep 17 00:00:00 2001 From: t_jeang Date: Tue, 6 Jan 2009 12:05:57 +0000 Subject: [PATCH] imported patch intel-net-driver-kcompat.patch --- drivers/net/e1000/kcompat.h | 6 +++--- drivers/net/e1000e/kcompat.h | 6 +++--- drivers/net/igb/kcompat.h | 6 +++--- drivers/net/ixgb/kcompat.h | 6 +++--- drivers/net/ixgbe/kcompat.h | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/net/e1000/kcompat.h b/drivers/net/e1000/kcompat.h index 1a53d5a1..3b857072 100644 --- 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 d860f54d..0dd50727 100644 --- 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 32cc976f..9a0bb77b 100644 --- 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 0883509c..8ba46fa5 100644 --- 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 7d05b764..9e39bed8 100644 --- 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 */ -- 2.39.5