[Pkg-voip-commits] r2751 - in zaptel/trunk: debian vzaphfc

[Kilian Krause]

Author: kilian
Date: 2006-11-26 20:47:29 +0100 (Sun, 26 Nov 2006)
New Revision: 2751

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/control
   zaptel/trunk/vzaphfc/vzaphfc_main.c
Log:
vzaphfc/vzaphfc_main.c: Add fix from Jens Wilke (might close #386498)
debian/control: Remove nonexistant zaptel-modules (Closes: #387961)
debian/changelog: Document changes


Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-11-26 14:44:27 UTC (rev 2750)
+++ zaptel/trunk/debian/changelog	2006-11-26 19:47:29 UTC (rev 2751)
@@ -5,8 +5,12 @@
   * Reverting my changes from 1:1.2.9.1.dfsg-2. Moved to the experimental
     branch.
 
- -- Mark Purcell <msp at debian.org>  Tue, 24 Oct 2006 22:51:14 +0100
+  [ Kilian Krause ]
+  * Remove bogus zaptel-modules from being Recommends (Closes: #387961)
+  * Update vzaphfc as proposed by Jens Wilke
 
+ -- Kilian Krause <kilian at debian.org>  Sun, 26 Nov 2006 20:35:48 +0100
+
 zaptel (1:1.2.10.dfsg-2) unstable; urgency=low
 
   * bristuff-0.3.0-PRE-1v

Modified: zaptel/trunk/debian/control
===================================================================
--- zaptel/trunk/debian/control	2006-11-26 14:44:27 UTC (rev 2750)
+++ zaptel/trunk/debian/control	2006-11-26 19:47:29 UTC (rev 2751)
@@ -12,7 +12,6 @@
 # Xorcom packages depend on xpp-firmware. Debian zaptel will probably 
 # just recommend it.
 Depends: ${shlibs:Depends}, procps, fxload
-Recommends: zaptel-modules
 Description: zapata telephony utilities
  Userspace utilities for configuring the Zapata telephony kernel driver, 
  which supports various telephony hardware, such as Wildcard series of

Modified: zaptel/trunk/vzaphfc/vzaphfc_main.c
===================================================================
--- zaptel/trunk/vzaphfc/vzaphfc_main.c	2006-11-26 14:44:27 UTC (rev 2750)
+++ zaptel/trunk/vzaphfc/vzaphfc_main.c	2006-11-26 19:47:29 UTC (rev 2751)
@@ -1327,7 +1327,11 @@
 
 	skb->dev = card->chans[D].netdev;
 	skb->protocol = htons(card->chans[D].protocol);
+#ifndef CHECKSUM_HW
+	skb->ip_summed = CHECKSUM_COMPLETE;
+#else
 	skb->ip_summed = CHECKSUM_HW;
+#endif
 	skb->pkt_type = PACKET_OUTGOING;
 
 	memcpy(skb_put(skb, card->chans[D].tx.ugly_framebuf_size),
@@ -1524,7 +1528,12 @@
 			skb->pkt_type = PACKET_HOST;
 		}
 
-		skb->ip_summed = CHECKSUM_HW; // HFC does the checksum
+               // HFC does the checksum
+#ifndef CHECKSUM_HW
+		skb->ip_summed = CHECKSUM_COMPLETE;
+#else
+		skb->ip_summed = CHECKSUM_HW;
+#endif
 
 		if (chan->open_by_zaptel) {
 			card->chans[D].rx.ugly_framebuf_size = frame_size - 1;