[Pkg-voip-commits] r7578 - in /dahdi-linux/trunk/debian: changelog patches/series patches/zaphfc_no_owner

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Sep  7 13:36:13 2009
New Revision: 7578

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7578
Log:
Patch zaphfc_no_owner: Fix zaphfc with kernel 2.6.30.

Added:
    dahdi-linux/trunk/debian/patches/zaphfc_no_owner
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=7578&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Mon Sep  7 13:36:13 2009
@@ -8,6 +8,7 @@
   * Remove obsolete bristuff drivers we don't build anyway.
     Leave vzaphfc for now as this is practically upstream.
   * Not applying bri_dchan. Astribank BRI spans will use hardhdlc.
+  * Patch zaphfc_no_owner: Fix zaphfc with kernel 2.6.30.
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 11 Aug 2009 15:11:53 +0300
 

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=7578&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Mon Sep  7 13:36:13 2009
@@ -13,3 +13,4 @@
 oslec_kbuild
 no_firmware_download
 mmx_auto
+zaphfc_no_owner

Added: dahdi-linux/trunk/debian/patches/zaphfc_no_owner
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/zaphfc_no_owner?rev=7578&op=file
==============================================================================
--- dahdi-linux/trunk/debian/patches/zaphfc_no_owner (added)
+++ dahdi-linux/trunk/debian/patches/zaphfc_no_owner Mon Sep  7 13:36:13 2009
@@ -1,0 +1,27 @@
+The 'osnwer' field in procfs should not be used as of 2.6.30.
+Use the same fix as of upstream r6642 (Upstream issue 14964).
+
+--- a/drivers/dahdi/zaphfc/base.c
++++ b/drivers/dahdi/zaphfc/base.c
+@@ -70,6 +70,12 @@ int debug_level;
+ #define TRUE (!FALSE)
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
++#define	SET_PROC_DIRENTRY_OWNER(p)	do { (p)->owner = THIS_MODULE; }
++#else
++#define	SET_PROC_DIRENTRY_OWNER(p)	do { } while(0);
++#endif
++
+ static struct pci_device_id hfc_pci_ids[] = {
+ 	{PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_2BD0,
+ 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+@@ -1556,7 +1562,7 @@ static int __devinit hfc_probe(struct pc
+ 			sizeof(card->proc_dir_name),
+ 			"%d", card->cardnum);
+ 	card->proc_dir = proc_mkdir(card->proc_dir_name, hfc_proc_zaphfc_dir);
+-	card->proc_dir->owner = THIS_MODULE;
++	SET_PROC_DIRENTRY_OWNER(card->proc_dir);
+ 
+ 	hfc_resetCard(card);
+