[Asterisk-cvs] zaptel ztd-eth.c,1.8,1.8.2.1

russell at lists.digium.com russell at lists.digium.com
Thu Oct 14 18:30:36 CDT 2004


Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv15075

Modified Files:
      Tag: v1-0
	ztd-eth.c 
Log Message:
fix build for 2.6.9 kernel (bug #2636)


Index: ztd-eth.c
===================================================================
RCS file: /usr/cvsroot/zaptel/ztd-eth.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- ztd-eth.c	16 Aug 2004 17:27:12 -0000	1.8
+++ ztd-eth.c	14 Oct 2004 22:30:55 -0000	1.8.2.1
@@ -86,7 +86,11 @@
 	struct zt_span *span;
 	struct ztdeth_header *zh;
 	zh = (struct ztdeth_header *)skb->nh.raw;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,9)
+        span = ztdeth_getspan(eth_hdr(skb)->h_source, zh->subaddr);
+#else
 	span = ztdeth_getspan(skb->mac.ethernet->h_source, zh->subaddr);
+#endif
 	if (span) {
 		skb_pull(skb, sizeof(struct ztdeth_header));
 		zt_dynamic_receive(span, (unsigned char *)skb->data, skb->len);




More information about the svn-commits mailing list