[zaptel-commits] kpfleming: branch 1.4 r1924 - in /branches/1.4: ./ ztd-eth.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jan 23 09:39:43 2007
New Revision: 1924

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1924
Log:
Merged revisions 1923 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1923 | kpfleming | 2007-01-23 09:39:12 -0600 (Tue, 23 Jan 2007) | 2 lines

use the proper function prototype for 2.6 kernels

........

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=1924&r1=1923&r2=1924
==============================================================================
--- branches/1.4/ztd-eth.c (original)
+++ branches/1.4/ztd-eth.c Tue Jan 23 09:39:43 2007
@@ -86,7 +86,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;