[Pkg-voip-commits] r8506 - in /dahdi-linux/trunk/debian: changelog patches/oslec_include_2634 patches/series patches/voicebus_sem_h_2635 patches/xpp_usb_buffer_2635
tzafrir at alioth.debian.org
tzafrir at alioth.debian.org
Fri Jun 18 12:14:31 UTC 2010
Author: tzafrir
Date: Fri Jun 18 12:14:29 2010
New Revision: 8506
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8506
Log:
* Patch oslec_include_2634: fix building with 2.6.34 (Closes: #586216).
* Patches xpp_usb_buffer_2635, voicebus_sem_h_2635: Likewise for 2.6.35.
Added:
dahdi-linux/trunk/debian/patches/oslec_include_2634
dahdi-linux/trunk/debian/patches/voicebus_sem_h_2635
dahdi-linux/trunk/debian/patches/xpp_usb_buffer_2635
Modified:
dahdi-linux/trunk/debian/changelog
dahdi-linux/trunk/debian/patches/series
Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=8506&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Fri Jun 18 12:14:29 2010
@@ -5,8 +5,10 @@
* Patch wcb4xxp_extra_trunk: merged upstream.
* Patch chanmute: make it also explicitly disable the untested
DAHDI_AUDIO_NOTIFY.
-
- -- Tzafrir Cohen <tzafrir at debian.org> Fri, 18 Jun 2010 14:09:17 +0300
+ * Patch oslec_include_2634: fix building with 2.6.34 (Closes: #586216).
+ * Patches xpp_usb_buffer_2635, voicebus_sem_h_2635: Likewise for 2.6.35.
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Fri, 18 Jun 2010 15:06:37 +0300
dahdi-linux (1:2.2.1.1+dfsg-1) unstable; urgency=low
Added: dahdi-linux/trunk/debian/patches/oslec_include_2634
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/oslec_include_2634?rev=8506&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/oslec_include_2634 (added)
+++ dahdi-linux/trunk/debian/patches/oslec_include_2634 Fri Jun 18 12:14:29 2010
@@ -1,0 +1,28 @@
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Origin: http://svn.asterisk.org/svn/dahdi/linux/branches/2.3@8679
+Subject: missing #include: fixes building with 2.6.34-rc5
+
+Fix the same issue as in upstream r8550 , for dahdi_echocan_oslec.c:
+
+With kernel 2.6.34-rc5 an explicit '#include <slab.h>' is required for using
+kzalloc() and friends.
+
+---
+ drivers/dahdi/dahdi_echocan_oslec.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/dahdi/dahdi_echocan_oslec.c b/drivers/dahdi/dahdi_echocan_oslec.c
+index a8d38b9..abbeb51 100644
+--- a/drivers/dahdi/dahdi_echocan_oslec.c
++++ b/drivers/dahdi/dahdi_echocan_oslec.c
+@@ -23,6 +23,7 @@
+ */
+
+ #include <linux/kernel.h>
++#include <linux/slab.h>
+ #include <linux/errno.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+--
+1.7.1
+
Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=8506&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Fri Jun 18 12:14:29 2010
@@ -4,3 +4,6 @@
mmx_auto
uk_rotary
chanmute
+oslec_include_2634
+xpp_usb_buffer_2635
+voicebus_sem_h_2635
Added: dahdi-linux/trunk/debian/patches/voicebus_sem_h_2635
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/voicebus_sem_h_2635?rev=8506&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/voicebus_sem_h_2635 (added)
+++ dahdi-linux/trunk/debian/patches/voicebus_sem_h_2635 Fri Jun 18 12:14:29 2010
@@ -1,0 +1,35 @@
+Subject: include semaphore.h explicitly for newer kernels
+Origin: http://svn.asterisk.org/svn/dahdi/linux/trunk@8758
+Bug: https://issues.asterisk.org/view.php?id=17382
+
+With kernel version >= 2.6.35-rc1, building failed with:
+
+ drivers/dahdi/voicebus/GpakCust.h:114: error: field ‘sem’ has incomplete type
+
+Reported by: Chainsaw
+Patches:
+ 07-semaphore-include-not-optional.diff uploaded by Chainsaw (license 723)
+
+---
+ drivers/dahdi/voicebus/GpakCust.h | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/dahdi/voicebus/GpakCust.h b/drivers/dahdi/voicebus/GpakCust.h
+index 2b28480..64ef44a 100644
+--- a/drivers/dahdi/voicebus/GpakCust.h
++++ b/drivers/dahdi/voicebus/GpakCust.h
+@@ -40,6 +40,11 @@
+ #include <linux/completion.h>
+ #include <linux/workqueue.h>
+ #include <linux/delay.h>
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
++#include <linux/semaphore.h>
++#endif
+
+ #include "gpakenum.h"
+ #include "adt_lec.h"
+--
+1.7.1
+
Added: dahdi-linux/trunk/debian/patches/xpp_usb_buffer_2635
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/xpp_usb_buffer_2635?rev=8506&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/xpp_usb_buffer_2635 (added)
+++ dahdi-linux/trunk/debian/patches/xpp_usb_buffer_2635 Fri Jun 18 12:14:29 2010
@@ -1,0 +1,57 @@
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Bug: https://issues.asterisk.org/view.php?id=17383
+Origin: http://svn.asterisk.org/svn/dahdi/linux/trunk@8762
+Subject: Use usb_{alloc,free}_coherent instead of usb_buffer_{alloc,free}
+
+usb_buffer_alloc has been replaced with usb_alloc_coherent , and likewise
+usb_buffer_free has been replaced with usb_free_coherent. in kernels 2.6.34
+the older names are proxies for the new ones, and in 2.6.35 the older names are gone.
+
+This patch defines the new names for the old ones, for older kernel versions.
+
+Reported by: Chainsaw
+
+---
+ drivers/dahdi/xpp/xpp_usb.c | 12 ++++++++++--
+ 1 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c
+index d69c99d..15507ee 100644
+--- a/drivers/dahdi/xpp/xpp_usb.c
++++ b/drivers/dahdi/xpp/xpp_usb.c
+@@ -78,6 +78,14 @@ static DEF_PARM(uint, drop_pcm_after, 6, 0644, "Number of consecutive tx_sluggis
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
+ # warning "This module is tested only with 2.6 kernels"
+ #endif
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)
++# define usb_alloc_coherent(dev, size, mem_flags, dma) \
++ usb_buffer_alloc(dev, size, mem_flags, dma)
++# define usb_free_coherent(dev, size, addr, dma) \
++ usb_buffer_free(dev, size, addr, dma)
++#endif
++
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
+ # undef USB_FIELDS_MISSING
+ #else
+@@ -308,7 +316,7 @@ static xframe_t *alloc_xframe(xbus_t *xbus, gfp_t gfp_flags)
+ return NULL;
+ }
+ usb_init_urb(&uframe->urb);
+- p = usb_buffer_alloc(xusb->udev, size, gfp_flags, &uframe->urb.transfer_dma);
++ p = usb_alloc_coherent(xusb->udev, size, gfp_flags, &uframe->urb.transfer_dma);
+ if(!p) {
+ if((rate_limit++ % 1003) == 0)
+ XUSB_ERR(xusb, "buffer allocation failed (%d)\n", rate_limit);
+@@ -330,7 +338,7 @@ static void free_xframe(xbus_t *xbus, xframe_t *xframe)
+
+ BUG_ON(xbus->transport.priv != uframe->xusb);
+ //XUSB_INFO(uframe->xusb, "frame_free\n");
+- usb_buffer_free(urb->dev, uframe->transfer_buffer_length,
++ usb_free_coherent(urb->dev, uframe->transfer_buffer_length,
+ urb->transfer_buffer,
+ urb->transfer_dma);
+ memset(uframe, 0, sizeof(*uframe));
+--
+1.7.1
+
More information about the Pkg-voip-commits
mailing list