[zaptel-commits] tzafrir: branch 1.4 r3446 - in /branches/1.4: ./ ztd-eth.c

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Wed Dec 12 02:53:45 2007
New Revision: 3446

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3446
Log:
ztd-eth: Fix a cast warning on earlier 2.6 kernels.

Merged revisions 3445 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/ztd-eth.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/ztd-eth.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/ztd-eth.c?view=diff&rev=3446&r1=3445&r2=3446
==============================================================================
--- branches/1.4/ztd-eth.c (original)
+++ branches/1.4/ztd-eth.c Wed Dec 12 02:53:45 2007
@@ -86,7 +86,7 @@
 	return span;
 }
 
-#if defined(LINUX26)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,14)
 static int ztdeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
 #else
 static int ztdeth_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)