[svn-commits] kpfleming: branch 1.2 r1923 - /branches/1.2/ztd-eth.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jan 23 09:39:12 2007
New Revision: 1923

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1923
Log:
use the proper function prototype for 2.6 kernels

Modified:
    branches/1.2/ztd-eth.c

Modified: branches/1.2/ztd-eth.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/ztd-eth.c?view=diff&rev=1923&r1=1922&r2=1923
==============================================================================
--- branches/1.2/ztd-eth.c (original)
+++ branches/1.2/ztd-eth.c Tue Jan 23 09:39:12 2007
@@ -84,7 +84,11 @@
 	return span;
 }
 
+#if defined(LINUX26)
+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)
+#endif
 {
 	struct zt_span *span;
 	struct ztdeth_header *zh;