From: mtaylor Date: Thu, 22 Nov 2007 01:02:08 +0000 (+0000) Subject: Wrap use of input_dev in preprocessor conditionals. Went away in 2.6.20. X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=9dc2e2884aaf0153fca08ca44a929fa18889673c;p=madwifi%2F.git Wrap use of input_dev in preprocessor conditionals. Went away in 2.6.20. git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@2913 0192ed92-7a03-0410-a25b-9323aeb14dbd --- diff --git a/net80211/ieee80211_skb.c b/net80211/ieee80211_skb.c index d70f4ca..31877f4 100644 --- a/net80211/ieee80211_skb.c +++ b/net80211/ieee80211_skb.c @@ -131,12 +131,17 @@ static void skb_print_message( #else printk("%s: %s%s:%d %s\n", #endif - (skb->input_dev != NULL ? +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)) + (skb->input_dev != NULL ? DEV_NAME(skb->input_dev) : DEV_NAME(skb->dev)), +#else + DEV_NAME(skb->dev), +#endif + skb_count, #ifdef IEEE80211_DEBUG_REFCNT - func1, line1, + func1, line1, #endif func2, line2, expanded_message);