diff -Nru dahdi-linux-2.5.0.1+dfsg/debian/changelog dahdi-linux-2.5.0.1+dfsg/debian/changelog --- dahdi-linux-2.5.0.1+dfsg/debian/changelog 2011-10-27 18:51:28.000000000 -0400 +++ dahdi-linux-2.5.0.1+dfsg/debian/changelog 2012-02-07 16:27:07.000000000 -0500 @@ -1,3 +1,9 @@ +dahdi-linux (1:2.5.0.1+dfsg-1ubuntu2) precise; urgency=low + + * Fix compile issues with 3.2 kernel. + + -- Paul Belanger Tue, 07 Feb 2012 16:26:21 -0500 + dahdi-linux (1:2.5.0.1+dfsg-1ubuntu1) precise; urgency=low * Merge from Debian testing (LP: #879743). Remaining changes: diff -Nru dahdi-linux-2.5.0.1+dfsg/debian/patches/debian-changes-1:2.5.0.1+dfsg-1ubuntu2 dahdi-linux-2.5.0.1+dfsg/debian/patches/debian-changes-1:2.5.0.1+dfsg-1ubuntu2 --- dahdi-linux-2.5.0.1+dfsg/debian/patches/debian-changes-1:2.5.0.1+dfsg-1ubuntu2 1969-12-31 19:00:00.000000000 -0500 +++ dahdi-linux-2.5.0.1+dfsg/debian/patches/debian-changes-1:2.5.0.1+dfsg-1ubuntu2 2012-02-07 16:41:02.000000000 -0500 @@ -0,0 +1,34 @@ +Description: Upstream changes introduced in version 1:2.5.0.1+dfsg-1ubuntu2 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + dahdi-linux (1:2.5.0.1+dfsg-1ubuntu2) precise; urgency=low + . + * Fix compile issues with 3.2 kernel. + . + The person named in the Author field signed this changelog entry. +Author: Paul Belanger + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Forwarded: +Reviewed-By: +Last-Update: + +--- dahdi-linux-2.5.0.1+dfsg.orig/drivers/dahdi/voicebus/GpakCust.h ++++ dahdi-linux-2.5.0.1+dfsg/drivers/dahdi/voicebus/GpakCust.h +@@ -36,7 +36,6 @@ + #ifndef _GPAKCUST_H /* prevent multiple inclusion */ + #define _GPAKCUST_H + +-#include + #include + #include + #include diff -Nru dahdi-linux-2.5.0.1+dfsg/debian/patches/missing_modules.h.diff dahdi-linux-2.5.0.1+dfsg/debian/patches/missing_modules.h.diff --- dahdi-linux-2.5.0.1+dfsg/debian/patches/missing_modules.h.diff 1969-12-31 19:00:00.000000000 -0500 +++ dahdi-linux-2.5.0.1+dfsg/debian/patches/missing_modules.h.diff 2012-02-07 16:40:08.000000000 -0500 @@ -0,0 +1,38 @@ +Description: #include in dahdi/kernel.h and GpakCust.h +Origin: http://svnview.digium.com/svn/dahdi?view=revision&revision=10363 + +Commit de47725, first released in 3.2-rc1 removed module.h from some +kernel headers. Include it explicitly now. + +Resolves compilation errors like: +error: implicit declaration of function 'try_module_get' +error: 'THIS_MODULE' undeclared (first use in this function) +error: implicit declaration of function 'module_put' + +Signed-off-by: Shaun Ruffell + +Index: dahdi-linux-2.5.0.1+dfsg/include/dahdi/kernel.h +=================================================================== +--- dahdi-linux-2.5.0.1+dfsg.orig/include/dahdi/kernel.h 2012-02-07 16:36:48.482751165 -0500 ++++ dahdi-linux-2.5.0.1+dfsg/include/dahdi/kernel.h 2012-02-07 16:36:59.858746074 -0500 +@@ -43,6 +43,7 @@ + #endif + #include + #include ++#include + #include + + #ifdef CONFIG_DAHDI_NET +Index: dahdi-linux-2.5.0.1+dfsg/drivers/dahdi/voicebus/GpakCust.h +=================================================================== +--- dahdi-linux-2.5.0.1+dfsg.orig/drivers/dahdi/voicebus/GpakCust.h 2011-06-02 16:03:20.000000000 -0400 ++++ dahdi-linux-2.5.0.1+dfsg/drivers/dahdi/voicebus/GpakCust.h 2012-02-07 16:37:28.830734088 -0500 +@@ -36,6 +36,7 @@ + #ifndef _GPAKCUST_H /* prevent multiple inclusion */ + #define _GPAKCUST_H + ++#include + #include + #include + #include +ifdef CONFIG_DAHDI_NET diff -Nru dahdi-linux-2.5.0.1+dfsg/debian/patches/ndo_set_multicast_list.diff dahdi-linux-2.5.0.1+dfsg/debian/patches/ndo_set_multicast_list.diff --- dahdi-linux-2.5.0.1+dfsg/debian/patches/ndo_set_multicast_list.diff 1969-12-31 19:00:00.000000000 -0500 +++ dahdi-linux-2.5.0.1+dfsg/debian/patches/ndo_set_multicast_list.diff 2012-02-07 16:31:50.000000000 -0500 @@ -0,0 +1,46 @@ +Description: Replace 'ndo_set_multicast_list' with 'set_rx_mode' +Origin: http://svnview.digium.com/svn/dahdi?view=revision&revision=10362 + +The ndo_set_multicast_list callback was removed in b81693d9, which was +first released in Linux Kernel 3.2-rc1 + +Signed-off-by: Shaun Ruffell + +--- a/drivers/dahdi/wctc4xxp/base.c ++++ b/drivers/dahdi/wctc4xxp/base.c +@@ -488,6 +488,7 @@ wctc4xxp_skb_to_cmd(struct wcdte *wc, co + return cmd; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) + static void + wctc4xxp_net_set_multi(struct net_device *netdev) + { +@@ -495,6 +496,15 @@ wctc4xxp_net_set_multi(struct net_device + DTE_DEBUG(DTE_DEBUG_GENERAL, "%s promiscuity:%d\n", + __func__, netdev->promiscuity); + } ++#else ++static void ++wctc4xxp_set_rx_mode(struct net_device *netdev) ++{ ++ struct wcdte *wc = wcdte_from_netdev(netdev); ++ DTE_DEBUG(DTE_DEBUG_GENERAL, "%s promiscuity:%d\n", ++ __func__, netdev->promiscuity); ++} ++#endif + + static int + wctc4xxp_net_up(struct net_device *netdev) +@@ -658,7 +668,11 @@ wctc4xxp_net_ioctl(struct net_device *ne + + #ifdef HAVE_NET_DEVICE_OPS + static const struct net_device_ops wctc4xxp_netdev_ops = { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0) + .ndo_set_multicast_list = &wctc4xxp_net_set_multi, ++#else ++ .ndo_set_rx_mode = &wctc4xxp_set_rx_mode, ++#endif + .ndo_open = &wctc4xxp_net_up, + .ndo_stop = &wctc4xxp_net_down, + .ndo_start_xmit = &wctc4xxp_net_hard_start_xmit, diff -Nru dahdi-linux-2.5.0.1+dfsg/debian/patches/series dahdi-linux-2.5.0.1+dfsg/debian/patches/series --- dahdi-linux-2.5.0.1+dfsg/debian/patches/series 2011-10-27 18:51:28.000000000 -0400 +++ dahdi-linux-2.5.0.1+dfsg/debian/patches/series 2012-02-07 16:41:02.000000000 -0500 @@ -6,3 +6,6 @@ notest xpp_fix_2fxs6fxo zaphfc_d_channel_fix.patch +missing_modules.h.diff +ndo_set_multicast_list.diff +debian-changes-1:2.5.0.1+dfsg-1ubuntu2