[zaptel-commits] kpfleming: trunk r1925 - in /trunk: ./ ztd-eth.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jan 23 09:40:33 2007
New Revision: 1925

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

................
r1924 | kpfleming | 2007-01-23 09:39:43 -0600 (Tue, 23 Jan 2007) | 10 lines

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:
    trunk/   (props changed)
    trunk/ztd-eth.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Tue Jan 23 09:40:33 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536,1543,1547,1568,1574,1576,1601,1611,1615,1642,1661,1664,1687,1698,1701,1767,1774,1820,1828,1836,1878,1887,1892,1899,1913,1921,1924

Modified: trunk/ztd-eth.c
URL: http://svn.digium.com/view/zaptel/trunk/ztd-eth.c?view=diff&rev=1925&r1=1924&r2=1925
==============================================================================
--- trunk/ztd-eth.c (original)
+++ trunk/ztd-eth.c Tue Jan 23 09:40:33 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;