[Pkg-voip-commits] r5256 - in /zaptel/trunk: debian/changelog kernel/vzaphfc/lapd.c kernel/vzaphfc/vzaphfc_main.c

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sun Mar  2 07:51:21 2008
New Revision: 5256

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5256
Log:
Adjust vzaphfc to netdevice API changes in kernel 2.6.24.

Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/kernel/vzaphfc/lapd.c
    zaptel/trunk/kernel/vzaphfc/vzaphfc_main.c

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=5256&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Sun Mar  2 07:51:21 2008
@@ -8,6 +8,7 @@
     http://sourceforge.net/mailarchive/message.php?msg_name=20080217212421.GT15415%40xorcom.com
     (Closes: #447245).
   * Adjusted lintian overrides: mknod is now called from a function.
+  * Adjust vzaphfc to netdevice API changes in kernel 2.6.24. 
 
  -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Fri, 29 Feb 2008 08:58:12 +0200
 

Modified: zaptel/trunk/kernel/vzaphfc/lapd.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/kernel/vzaphfc/lapd.c?rev=5256&op=diff
==============================================================================
--- zaptel/trunk/kernel/vzaphfc/lapd.c (original)
+++ zaptel/trunk/kernel/vzaphfc/lapd.c Sun Mar  2 07:51:21 2008
@@ -7,6 +7,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/version.h>
 #include <linux/netdevice.h>
 
 #include "lapd.h"
@@ -25,11 +26,13 @@
 {
 
 	netdev->change_mtu         = lapd_change_mtu;
+	netdev->set_mac_address    = lapd_mac_addr;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
 	netdev->hard_header        = NULL;
 	netdev->rebuild_header     = NULL;
-	netdev->set_mac_address    = lapd_mac_addr;
 	netdev->hard_header_cache  = NULL;
 	netdev->header_cache_update= NULL;
+#endif
 
 	netdev->type               = ARPHRD_LAPD;
 	netdev->hard_header_len    = 0;

Modified: zaptel/trunk/kernel/vzaphfc/vzaphfc_main.c
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/kernel/vzaphfc/vzaphfc_main.c?rev=5256&op=diff
==============================================================================
--- zaptel/trunk/kernel/vzaphfc/vzaphfc_main.c (original)
+++ zaptel/trunk/kernel/vzaphfc/vzaphfc_main.c Sun Mar  2 07:51:21 2008
@@ -1580,7 +1580,9 @@
 
 	memset(chan->netdev->dev_addr, 0x00, sizeof(chan->netdev->dev_addr));
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
 	SET_MODULE_OWNER(chan->netdev);
+#endif
 }
 
 static int __devinit hfc_probe(struct pci_dev *pci_dev,