From ea868797b66ae6988f11012cee6d6a3335cf3d47 Mon Sep 17 00:00:00 2001 From: mtaylor Date: Thu, 22 Nov 2007 07:57:43 +0000 Subject: [PATCH] Comment out some stuff added after 2.4 kernel. 2.6.0 is just a guess, but should serve as a starting point. git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2927 0192ed92-7a03-0410-a25b-9323aeb14dbd --- net80211/ieee80211_skb.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net80211/ieee80211_skb.c b/net80211/ieee80211_skb.c index 990438f..b15bd88 100644 --- a/net80211/ieee80211_skb.c +++ b/net80211/ieee80211_skb.c @@ -387,6 +387,7 @@ unref_skb(struct sk_buff *skb, int type, untrack_skb(skb, -1, func1, line1, func2, line2); } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) if ( (in_irq() || irqs_disabled()) && (type == UNREF_USE_KFREE_SKB || type == UNREF_USE_DEV_KFREE_SKB)) { @@ -397,6 +398,7 @@ unref_skb(struct sk_buff *skb, int type, type = UNREF_USE_DEV_KFREE_SKB_ANY; dump_stack(); } +#endif switch (type) { case UNREF_USE_DEV_KFREE_SKB_ANY: @@ -691,7 +693,9 @@ int dev_queue_xmit_debug(struct sk_buff *skb, struct sk_buff * skb_share_check_debug(struct sk_buff *skb, gfp_t pri, const char *func, int line) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) might_sleep_if(pri & __GFP_WAIT); +#endif if (skb_shared(skb)) { struct sk_buff *nskb = track_skb( clean_clone_or_copy(skb_clone(skb, pri)), @@ -714,7 +718,9 @@ void kfree_skb_fast_debug(struct sk_buff *skb, struct sk_buff * skb_unshare_debug(struct sk_buff *skb, gfp_t pri, const char *func, int line) { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) might_sleep_if(pri & __GFP_WAIT); +#endif if (skb_cloned(skb)) { struct sk_buff *nskb = track_skb( clean_clone_or_copy(skb_copy(skb, pri)), 0, -- 2.35.1