diff --git a/ChangeLog.stable b/ChangeLog.stable
index f54b2ed..5644456 100644
--- a/ChangeLog.stable
+++ b/ChangeLog.stable
@@ -7,7 +7,26 @@ Author: Nenad Corbic <ncorbic@sangoma.com>
 Copyright (c) 1995-2007 Sangoma Technologies Inc.
 ------------------------------------------------------------------------------
 
-* Wed Oct 10 2007 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.0
+* Wed Oct 6 2007 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.1
+===================================================================== 
+
+- Setup Zap Chunk Size Patch updated for Zaptel 1.4 
+  Patch allows running zaptel in 8,16,40,80 chunk size.
+  However wct drivers must be removed from compilation :)
+  Patch is now fixed for Zaptel 1.4
+
+- Update to All AFT drivers for 64bit 2.6.22 kernel.
+  Updated affects: AFT A101/2/4/8/200/400 (all cards)
+  The major 2.6.20+ updates extend to 64bit as well.
+  Previous drivers segfaulted under 2.6.22 64bit 
+  kernels. This does not affect you if you are running
+  kennels lower than 2.6.22.
+
+- Updated legacy drivers for 2.6.22 kernel
+
+
+
+* Wed Oct 3 2007 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.0
 ===================================================================== 
 
 - The Beta 3.1.X releases has now been declared as STABLE 3.2.X 
diff --git a/ChangeLog.stable.bak b/ChangeLog.stable.bak
deleted file mode 100644
index 55fa30b..0000000
--- a/ChangeLog.stable.bak
+++ /dev/null
@@ -1,202 +0,0 @@
-------------------------------------------------------------------------------
-WANPIPE
-
-Linux Voice TDM/WAN Router Package
-------------------------------------------------------------------------------
-Author: Nenad Corbic <ncorbic@sangoma.com>
-Copyright (c) 1995-2007 Sangoma Technologies Inc.
-------------------------------------------------------------------------------
-
-* Wed Oct 10 2007 Nenad Corbic <ncorbic@sangoma.com> - Stable - 3.2.0
-===================================================================== 
-
-- The Beta 3.1.X releases has now been declared as STABLE 3.2.X 
-
-- Fixed AMI/D4 on MAXIM (A101/2/4/8D) cards
-- Fixed A200/A400 tip/ring no dialtone issues.
-- Fixed 2.6.22 support and above
-- Fixed RPM Build post install issue
-- Updated Setup install script
-  Option to build for zaptel: ./Setup zaptel
-- Working E&M/RBS/CAS Channel Bank support for MAXIM (A101/2/4/8) cards.
-- Fixed wanpipe crashing on system shutdown on some machines.
-  Caused by RedHat /var/lock/subsys mandatory lock file.
-- New Firmware for all MAXIM Cards (A101/2/4/8D)
-  Fimware V33: Fixes EC Chip Security errors that can cause
-  PRI to go down on some computers. Firmware is backward compatible
-  to any previous release.
-- Faxes/Modems working through hardware echo canceler.
-  Tested at 56K from one port to another.
-  New octasic update.
-- Analog Network SYNC Feature for Fax Support
-  Analog cards can be synched to T1/E1 clock
-  from adjacent A101/2/4/8 cards for flawless faxing
-  from FXO/FXS to T1/E1.
-
-- Known Issues: 
-  T1/E1 HighImpedance Tap for MAXIM (A101/2/4/8D) cards.
-  It works on original PMC A101/2/4 cards
-
-For more info: http://wiki.sangoma.com
-
-
-* Mon Oct 1 2007 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.1.4.6
-==================================================================== 
-
-- Fixed Makefile for 2.6.22.9 kernel.
-- Fixed all gcc4 warnings.
-
-
-* Tue Sep 26 2007 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.1.4.5
-==================================================================== 
-
-- Updated Setup install script
-- A200/A400 Analog driver update
-  Fixed noise issue introduced in 3.1.4.3 release
-- Updated SMG for Asterisk 1.4 & Callweaver
-
-
-* Tue Sep 18 2007 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.1.4.3
-==================================================================== 
-
-- A200/A400 Analog driver update
-  Fixed a problem where analog port starts up without 
-  dialtone.
-
-* Tue Sep 14 2007 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.1.4.2
-==================================================================== 
-
-- Update for 2.6.22 kernel.
-- wanrouter startup script update for redhat distros.
-  Fixes the issue on system shutdown, where wanpipe
-  module sometimes do not unload due to /var/lock/subsys/
-  lockfile check. This issue is only related or RedHat style distros.
-
-
-* Tue Aug 15 2007 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.1.4
-==================================================================== 
-
-- Added A101-SH old config support.
-  So onld A101u or A101c config file can be used with new A101-SH cards.
-
-- Updated KATM support in the LIP Layer.
-  Used to connect Kernel ATM Layer to Wanpipe ATM AAL5 layer
-  over all AFT cards.
-
-- Added a sanity checker for enabling HWEC.
-  Used to prevent duble hwec enable.
-
-- Added wancfg_tdmapi configurator
-
-- Updated SMG
-	
-
-* Mon Jun 30 2007 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.1.3
-==================================================================== 
-
-- Update to Ocatsic Hardware Echo Canceler Library
-  Turned of the NOISE suppression because it can interfere
-  with faxes. If you faxes did not work properly on 3.1.2
-  release they will work fine with this one.
-
-- Cleaned up the Setup installation script.
-
-
-* Mon Jun 16 2007 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.1.2
-==================================================================== 
-
-- Update to Octasic Hardware Echo Canceler library
-  This is a very important update that affects all AFT cards
-  with octasic hardware echo canceler.  The new octasic update
-  fixes faxing/modem issues over octasic hwec.  The previous
-  release contained a bug that limited the faxing/modem speeds
-  to 26k.  The new update properly detects fax/modem and works
-  with full speed of 33k fax and 56k modem.
-
-- A200/A400 Updated
-  This update fixes the offhook startup failure.
-  On startup if fxs is offhook driver will start correctly
-
-- Wanpipe Startup order changed
-  The wanpipe startup scripts on bootup were previously
-  set too early "S03wanrouter".  This caused unpredictable
-  behaviour on some systems.  We have now moved wanrouter 
-  startup on boot up to "S11wanrouter", after networking
-  code.
-
-- Zaptel Adjustable Chunk Size Feature
-  Wanpipe drivers can work with 1,2,5 and 10ms 
-  chunk size.  Zaptel also supports this, however
-  the wct4xx driver breaks compilation when chunk
-  size is changed.  ./Setup can how change the
-  zaptel chunk size for you and update zaptel
-  Makefiles to remove wct4xx driver out.
-
-  Zaptel with 1ms generates 1000 interrupts per sec
-  Zaptel with 10ms generates 100 interrupts per sec.
-
-  As you can see its a drastic interrupt performance
-  increase.
-
-  NOTE: This breaks software echo cancelation, but
-        its not needed since we have hwec.
-
-
-* Fri Jun 06 2007 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.1.1
-==================================================================== 
-
-- A101/2/4/8 (MAXIM) AFT Update IMPORTANT
-  A major bug fix for AFT Maxim E1 cards for E1 CRC4 Mode.
-  On some lines the E1/CRC4 mode causes line errors on 
-  the telco side which results in PRI not coming up.
- 
-  Symptiom: E1 is up (no alarms) on local side but pri is 
- 	    not coming up!  (Only in E1 CRC4 Mode)
-
-- A101/2/4/8 (MAXIM) Mandatory Firmware Update
-  An echo canceler bug has been fixed for all AFT
-  MAXIM Cards A101/2/4/8dm.  New firmware version is V31.
-  If you are running MAXIM cards with hwec wiht older
-  firmware version you must upgrade.
-
-- Updated SMG 
-  Fixed DTMF synchronization
-
-
-
-- Updated SMG 
-  Fixed DTMF synchronization
-
-
-* Fri Jun 06 2007 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.1.0.1
-==================================================================== 
-
-- Minor release
-- Contains zaptel patch for zaptel 1.2.17 and above.
-- No driver changes 
-
-* Fri May 17 2007 Nenad Corbic <ncorbic@sangoma.com> - Beta - 3.1.0
-====================================================================  
-
-- Major new BETA wanpipe release 
-  Changed wanpipe versioning:
-	Release: A.B.C.D
-	A - Major Relase number
-	B - Indicates Stable or Beta
-	    Odd number is Beta
-	    Even number is Stable
-	C - Minor Release number
-	D - Optional pre-release and custom releases
- 
-- Fixed RBS Support for all Maxim cards A101/2/4/8.
-
-- Support for 2.6.20 kernels.
-
-- Support for New: A101D A102D A104D Maxim cards
-     :
-- Support for New: AFT 56K DDS card
-
-- Redesigned TDM API Events
-
-- TDM API Analog Support
-
diff --git a/README-2.config b/README-2.config
index 792a91f..b00f7d6 100644
--- a/README-2.config
+++ b/README-2.config
@@ -2,31 +2,29 @@ Wanpipe Configuration
 ======================
 
 For Latest Info please visit
+-------------------------------------------------
 http://wiki.sangoma.com
+-------------------------------------------------
 
 
+Asterisk/Zaptel Configuration
+-> /usr/sbin/wancfg_zaptel
+
+TDM API Config
+-> /usr/sbin/wancfg_tdmapi
+
+SMG/SS7 Config
+-> /usr/sbin/wancfg_smg
+
+WAN Configuration
+-> /usr/sbin/wancfg
+
 
 Before starting WANPIPE, a configuration file (wanpipeN.conf, where
 N=1,2,3..etc.)must be created in /etc/wanpipe directory.  
 This file contains the line, hardware and interface definitions 
 for the WAN connection.
 
-RELEASE 2.3.2 and on:
-	The new WANCFG utility has been release. It should
-	be used to configure standard WAN protocols like:
-		FR, PPP, CHDLC, 
-		MULTILINK PPP (TTY), TDM_VOICE
-		HDLC API
-		ADSL
-		
-
-	For both AFT and S514 series cards.
-
-	The old WANCFG utility has been renamed to wancfg_legacy.
-	This utility should be used for all API protocols like:
-		X25, SDLC, BITSTREAMING ...
-
-
 The program /usr/sbin/wancfg should be used to create the
 configuration file(s).  It is a GUI, ncurses based,
 configurator that contains all wanpipe options
@@ -40,11 +38,16 @@ the sample configuration files located in
 
 Things you should know before starting /usr/sbin/wancfg:
 
-        1. Protocol:
+	1. Operatoin Mode:
+		VOICE : Asterisk/Zaptel, TDM API
+		WAN/IP: Frame Relay, MultiLink PPP etc..
+
+        2. Protocol:
+		Asterisk/Voice/TDM,
                 Frame Relay, MulitPort Frame Relay, 
 		CHDLC, PPP, MultiPort PPP, ADSL, X25 ...
 
-        2. Protocol/IP Info:
+        3. Protocol/IP Info:
                 Frame Relay:  Type of Status Signaling (LMI,
                               ANSI, or Q.933
                               Number of DLCI to configure
@@ -91,7 +94,7 @@ Things you should know before starting /usr/sbin/wancfg:
 
 			      IP Info:  (Not needed for PPPoE)	
 
-        3. CSU/DSU Info:
+        4. CSU/DSU Info:
 
                 T1/E1:  Encoding
                         Framing
diff --git a/README.changes b/README.changes
deleted file mode 100644
index 55a688e..0000000
--- a/README.changes
+++ /dev/null
@@ -1,87 +0,0 @@
-WANPIPE OFFICIAL RELEASE CHANGE LOG
-===================================
-
-
-Author: Nenad Corbic <ncorbic@sangoma.com>
-
-
-Wanpipe Linux Web Page:
--------------------
-For latest docs please visit Sangoma Wiki
-Sangoma Wiki: http://wiki.sangoma.com 
-
-
-MAJOR CHANGES
--------------
-
-	o The 2.3.4 release contains:
-	
-	  AFT A108 & A108D Drivers.
-	  Updated TDMV Channelized Driver for Asterisk
-	  with support for hardware echo cancellation.
-
-	  TDM API Drivers.
-	  Used to create custom TDM applications over
-	  sangoma AFT devices.
-
-	  Sangoma Signal Media Gateway: 
-	  SS7 Support for Asterisk
-	  
-	  LIP Protocol Layer: 
-          New protocols: ATM (AAL5), Frame Relay EEK
-
-
-	o The 2.3.3 release contains:
-
-	  AFT A104 TDMV Channelized Driver for Asterisk
-	  The A104 TDMV Driver uses the channelization feature
-	  of the A104 Card, to DMA 8byte chunks directly
-	  into Zaptel buffers.  
-
-	  AFT A104 TDMV DCHAN Feature
-	  The DCHAN PRI has hardware HDLC support.
-
-	o The 2.3.2 release contains:
-          
-	  Stable TDMV Wanpipe drivers for Asterisk.   
-          The TDMV drivers support both A102 and A104 cars.
-	  Please read wanpipe/doc/README.asterisk
-
-          Stable TE3 Drivers for AFT A301 TE3 Unchannelized Card. 
-          All WAN protocols are supported: Frame Relay, PPP, CHDLC..
-
-	  Stable LIP Network Layer:  Separates Wanpipe hardware from
-	  the Network Protocols: Frame Relay, CHDLC, 
-                                 PPP, LAPB API, XDLC  API
-
-	o The 2.3.1 contains major structural driver changes.
-	  The new Hardware Abstraction layer cleanly separates, the
-	  physical layer from the driver/protocol layers.
-
-	  Support for 2.6.X kernel.
-
-	o The 2.3.0 contains major structural driver changes 
-	  most notably the ADSL OS abstraction layer. ADLS drivers
-	  can now be compiled against any custom kernel.
-
-	o From 2.2.6 release forward the new S514-7 Dual T/E1, 
- 	  S514-8 Single TE1 and S518 ADSL cards are supproted.
-
-	o From 2.2.4 release forward the new S514-4 T/E1 and S514-5 56K
-          cards are supported.
-   
-	o From 2.2.3 release forward ALL wanpipe modules
-          including API modules, can be recompiled from
-           ./Setup installation script! 
-           NO KERNEL RE-COMPILATION is necessary.
-           
-	o From 2.2.3 release forward, wanpipe directory
-           architecture has been changed.  New home directory
-           for wanpipe is /etc/wanpipe. 
-   
-	o All old releases are in ../old_releases/wanpipe directory. 
-
-	o Custom RPMs can be build based on current kernel image
-	  by using the ./Setup buildrpm command.
-	  Read the README.rpmbuild.
-
diff --git a/README.changes b/README.changes
new file mode 120000
index 0000000..7d3ae4f
--- /dev/null
+++ b/README.changes
@@ -0,0 +1 @@
+ChangeLog.stable
\ No newline at end of file
diff --git a/Setup b/Setup
index e45378d..ab65f07 100755
--- a/Setup
+++ b/Setup
@@ -4978,6 +4978,21 @@ function tdmv_apply_zaptel_chunk_patch () {
                 fi
         fi
 
+        eval "cat Makefile |sed 's/^SUBDIR_MODULES:=.*//g'>$TEMP 2>/dev/null "
+        if [ $? -ne 0 ]; then
+                echo "   Failed to remove wct4xxp from Makefile"
+                exit 1
+        else
+                eval "\mv -f $TEMP Makefile"
+                if [ $? -ne 0 ]; then
+                        echo "   Failed to overwrite existing Makefile"
+                        exit 1
+                else
+                        echo "   wct4xxp module removed from Makefile successfully"
+                        zaptel_modified=1
+                fi
+        fi
+
 	if [ -f Makefile.kernel26 ]; then
 		eval "cat Makefile.kernel26 | sed 's/^obj-m.*+=.*wct4xx.*//g'>$TEMP 2>/dev/null "
 		if [ $? -ne 0 ]; then
@@ -6281,7 +6296,7 @@ KERNEL_UNAME=`uname -r`
 PKG_NAME=wanpipe
 DISTR_NAME="WANPIPE"
 PROD=wanrouter
-PROD_VER=3.2.0
+PROD_VER=3.2.1
 PROD_HOME=`pwd`
 META_CONF=$PROD_HOME/$PROD.rc
 WAN_INTR_DIR=$PROD_HOME/interfaces
diff --git a/api/libsangoma/config.log b/api/libsangoma/config.log
index 19a6b0f..7d87523 100644
--- a/api/libsangoma/config.log
+++ b/api/libsangoma/config.log
@@ -36,10 +36,8 @@ PATH: /sbin
 PATH: /bin
 PATH: /usr/sbin
 PATH: /usr/bin
-PATH: /usr/X11R6/bin
 PATH: /usr/sbin/scripts
 PATH: /root/bin
-PATH: /usr/sbin/scripts
 PATH: /bin
 PATH: /sbin
 PATH: /usr/bin
diff --git a/deb_control/wanpipe.deb b/deb_control/wanpipe.deb
index abe6a02..8ca4f4c 100644
--- a/deb_control/wanpipe.deb
+++ b/deb_control/wanpipe.deb
@@ -1,5 +1,5 @@
 Package: wanpipe
-Version: 3.2.0-0
+Version: 3.2.1-0
 Section: networking
 Priority: optional
 Architecture: all
diff --git a/patches/kdrivers/include/wanpipe_common.h b/patches/kdrivers/include/wanpipe_common.h
index 7de320d..c9a5e1f 100644
--- a/patches/kdrivers/include/wanpipe_common.h
+++ b/patches/kdrivers/include/wanpipe_common.h
@@ -1041,7 +1041,7 @@ static __inline unsigned char* wan_skb_data(void* skb)
 static __inline unsigned char* wan_skb_tail(void* skb)
 {
 #if defined(__LINUX__)
-	return ((struct sk_buff*)skb)->tail;
+	return wan_skb_tail_pointer((struct sk_buff*)skb);
 #elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
 	return mtod((struct mbuf*)skb, caddr_t) + ((struct mbuf*)skb)->m_len;
 #elif defined(__SOLARIS__)
@@ -1758,7 +1758,7 @@ static __inline void wan_skb_init(void* pskb, unsigned int len)
 #if defined(__LINUX__)
 	struct sk_buff* skb = (struct sk_buff*)pskb;
 	skb->data = skb->head + len;
-	skb->tail = skb->data;
+	wan_skb_reset_tail_pointer(skb);
 	skb->len  = 0;
 	skb->data_len = 0;   
 #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
diff --git a/patches/kdrivers/include/wanpipe_kernel.h b/patches/kdrivers/include/wanpipe_kernel.h
index c816b69..3cb627e 100644
--- a/patches/kdrivers/include/wanpipe_kernel.h
+++ b/patches/kdrivers/include/wanpipe_kernel.h
@@ -33,9 +33,15 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
 #define wan_skb_reset_mac_header(skb)  skb_reset_mac_header(skb)
 #define wan_skb_reset_network_header(skb) skb_reset_network_header(skb)
+#define wan_skb_tail_pointer(skb) skb_tail_pointer(skb)
+#define wan_skb_reset_tail_pointer(skb) skb_reset_tail_pointer(skb)
+#define wan_skb_set_tail_pointer(skb,offset) skb_set_tail_pointer(skb,offset)
 #else
-#define wan_skb_reset_mac_header(skb) (skb->mac.raw = skb->data)
-#define wan_skb_reset_network_header(skb) (skb->nh.raw  = skb->data)
+#define wan_skb_reset_mac_header(skb) ((skb)->mac.raw = (skb)->data)
+#define wan_skb_reset_network_header(skb) ((skb)->nh.raw  = (skb)->data)
+#define wan_skb_tail_pointer(skb) ((skb)->tail)
+#define wan_skb_reset_tail_pointer(skb) ((skb)->tail = (skb)->data)
+#define wan_skb_set_tail_pointer(skb,offset) ((skb)->tail = ((skb)->data + offset))
 #endif
 
 #ifndef IRQF_SHARED
diff --git a/patches/kdrivers/include/wanpipe_version.h b/patches/kdrivers/include/wanpipe_version.h
index 3c24ddd..baa2aca 100644
--- a/patches/kdrivers/include/wanpipe_version.h
+++ b/patches/kdrivers/include/wanpipe_version.h
@@ -6,8 +6,8 @@
 #define WANPIPE_COMPANY         "Sangoma Technologies Inc"
 
 /********** LINUX **********/
-#define WANPIPE_VERSION			"3.1.4"
-#define WANPIPE_SUB_VERSION		"5"
+#define WANPIPE_VERSION			"3.2.1"
+#define WANPIPE_SUB_VERSION		"0"
 #define WANPIPE_VERSION_BETA		1
 #define WANPIPE_LITE_VERSION		"1.1.1"
 
diff --git a/patches/kdrivers/src/net/.sdla_ppp.c.swp b/patches/kdrivers/src/net/.sdla_ppp.c.swp
new file mode 100644
index 0000000..52d4e41
Binary files /dev/null and b/patches/kdrivers/src/net/.sdla_ppp.c.swp differ
diff --git a/patches/kdrivers/src/net/sdla_adccp.c b/patches/kdrivers/src/net/sdla_adccp.c
index 43c159c..17e5095 100644
--- a/patches/kdrivers/src/net/sdla_adccp.c
+++ b/patches/kdrivers/src/net/sdla_adccp.c
@@ -320,7 +320,11 @@ static void timer_intr  (sdla_t *);
 /*=================================================  
  *	Background polling routines 
  */
-static void wpx_poll (void*);
+# if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
+static void wpx_poll (void * card_ptr);
+# else
+static void wpx_poll (struct work_struct *work);
+#endif
 #if 0
 static void poll_disconnected (sdla_t* card);
 #endif
@@ -655,7 +659,7 @@ int wp_adccp_init (sdla_t* card, wandev_conf_t* conf)
 	
 	init_global_statistics(card);	
 
-	INIT_WORK((&card->u.x.x25_poll_task),wpx_poll,card);
+	WAN_TASKQ_INIT((&card->u.x.x25_poll_task),0,wpx_poll,card);
 
 	init_timer(&card->u.x.x25_timer);
 	card->u.x.x25_timer.data = (unsigned long)card;
@@ -2062,10 +2066,18 @@ static void spur_intr (sdla_t* card)
  *    	enabled. Beware!
  *====================================================================*/
 
-static void wpx_poll (void *card_ptr)
+# if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20))
+static void wpx_poll (void * card_ptr)
+# else
+static void wpx_poll (struct work_struct *work)
+#endif
 {
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20))
+        sdla_t          *card = (sdla_t *)container_of(work, sdla_t, u.aft.port_task);
+#else
+        sdla_t          *card = (sdla_t *)card_ptr;
+#endif
 	netdevice_t	*dev;
-	sdla_t *card=card_ptr;
 	++card->statistics.poll_processed;
 	
 	dev = WAN_DEVLE2DEV(WAN_LIST_FIRST(&card->wandev.dev_head));
@@ -3490,6 +3502,7 @@ static int execute_delayed_cmd (sdla_t* card, netdevice_t *dev, char bad_cmd)
 			return -EAGAIN; 
 		}
 
+		card->hw_iface.peek(card->hw, card->flags_off, &flags, sizeof(flags));
 		if (flags.ghdlc_status & X25_HDLC_ABM){
 			DEBUG_TX("LAPB: HDLC Down ! TxQ=%d HDLC_Status=%d\n",
 					status->txQueued,
diff --git a/patches/kdrivers/src/net/sdla_asyhdlc.c b/patches/kdrivers/src/net/sdla_asyhdlc.c
index 0dd4396..698633d 100644
--- a/patches/kdrivers/src/net/sdla_asyhdlc.c
+++ b/patches/kdrivers/src/net/sdla_asyhdlc.c
@@ -229,7 +229,7 @@ static int set_asy_config (sdla_t* card);
 static int asy_comm_enable (sdla_t* card);
 
 /* Interrupt handlers */
-static void wpc_isr (sdla_t* card);
+static WAN_IRQ_RETVAL wpc_isr (sdla_t* card);
 static void rx_intr (sdla_t* card);
 static void timer_intr(sdla_t *);
 
@@ -1652,7 +1652,7 @@ static int update_comms_stats(sdla_t* card,
 	if (IS_TE1_CARD(card)) {	
 		card->wandev.fe_iface.read_alarm(&card->fe, 0); 
 		/* TE1 Update T1/E1 perfomance counters */
-		card->wandev.fe_iface.read_pmon(&card->fe); 
+		card->wandev.fe_iface.read_pmon(&card->fe, 0); 
 	}else if (IS_56K_CARD(card)) {
 		/* 56K Update CSU/DSU alarms */
 		card->wandev.fe_iface.read_alarm(&card->fe, 1); 
@@ -1739,7 +1739,7 @@ static unsigned char read_front_end_reg (void* card1, ...)
 /*============================================================================
  * Write to TE1/56K Front end registers  
  */
-static unsigned char write_front_end_reg (void* card1, ...)
+static int write_front_end_reg (void* card1, ...)
 {
 	va_list		args;
 	sdla_t		*card = (sdla_t*)card1;
@@ -1858,19 +1858,22 @@ static void chdlc_bh (unsigned long data)
 /*============================================================================
  * Cisco HDLC interrupt service routine.
  */
-static void wpc_isr (sdla_t* card)
+static WAN_IRQ_RETVAL wpc_isr (sdla_t* card)
 {
 	netdevice_t* dev;
 	SHARED_MEMORY_INFO_STRUCT	flags;
 	int i;
+	WAN_IRQ_RETVAL_DECL(irq_ret);
 
+
+	WAN_IRQ_RETVAL_SET(irq_ret, WAN_IRQ_HANDLED);
 	/* Check for which port the interrupt has been generated
 	 * Since Secondary Port is piggybacking on the Primary
          * the check must be done here. 
 	 */
 
 	if (!card->hw){
-		return;
+		WAN_IRQ_RETURN(irq_ret);
 	}
 	
 	card->hw_iface.peek(card->hw, card->flags_off,
@@ -1886,6 +1889,7 @@ static void wpc_isr (sdla_t* card)
 	if (!card->tty_opt && !dev && 
 	    flags.interrupt_info_struct.interrupt_type != 
 	    	COMMAND_COMPLETE_APP_INT_PEND){
+		WAN_IRQ_RETURN(irq_ret);
 		goto isr_done;
 	}
 	
@@ -1896,6 +1900,7 @@ static void wpc_isr (sdla_t* card)
 	if(test_bit(PERI_CRIT, (void*)&card->wandev.critical)) {
 		printk(KERN_INFO "%s: Chdlc ISR:  Critical with PERI_CRIT!\n",
 				card->devname);
+		WAN_IRQ_RETVAL_SET(irq_ret, WAN_IRQ_HANDLED);
 		goto isr_done;
 	}
 
@@ -1907,7 +1912,8 @@ static void wpc_isr (sdla_t* card)
 				card->devname);
 			card->in_isr = 0;
 			card->hw_iface.poke_byte(card->hw, card->intr_type_off, 0x00);
-			return;
+			WAN_IRQ_RETVAL_SET(irq_ret, WAN_IRQ_HANDLED);
+			WAN_IRQ_RETURN(irq_ret);
 		}
 	}
 
@@ -1989,7 +1995,9 @@ isr_done:
 
 	card->in_isr = 0;
 	card->hw_iface.poke_byte(card->hw, card->intr_type_off, 0x00);
-	return;
+
+	WAN_IRQ_RETVAL_SET(irq_ret, WAN_IRQ_HANDLED);
+        WAN_IRQ_RETURN(irq_ret);
 }
 
 /*============================================================================
diff --git a/patches/kdrivers/src/net/sdla_atm.c b/patches/kdrivers/src/net/sdla_atm.c
index cdfcf64..1610caf 100644
--- a/patches/kdrivers/src/net/sdla_atm.c
+++ b/patches/kdrivers/src/net/sdla_atm.c
@@ -1330,7 +1330,7 @@ static int if_send (netskb_t* skb, struct net_device* dev)
 {
 	private_area_t *chan = dev->priv;
 	sdla_t *card = chan->card;
-	unsigned long smp_flags;
+	unsigned long smp_flags=0;
 	int err=0;
 
 	/* Mark interface as busy. The kernel will not
diff --git a/patches/kdrivers/src/net/sdla_bitstrm.c b/patches/kdrivers/src/net/sdla_bitstrm.c
index 74f4fb3..ca979c2 100644
--- a/patches/kdrivers/src/net/sdla_bitstrm.c
+++ b/patches/kdrivers/src/net/sdla_bitstrm.c
@@ -787,7 +787,7 @@ int wpbit_init (sdla_t* card, wandev_conf_t* conf)
 
 	if (IS_T1_CARD(card)){
 
-		DEBUG_EVENT( "%s:      RBS Control =%s  Map=0x%08lX\n",
+		DEBUG_EVENT( "%s:      RBS Control =%s  Map=0x%08X\n",
 					card->devname,
 					card->u.b.cfg.rbs_map?
 					"ON":"OFF",card->u.b.cfg.rbs_map);
@@ -1265,7 +1265,7 @@ static int new_if (wan_device_t* wandev, netdevice_t* dev, wanif_conf_t* conf)
 				bstrm_priv_area->rbs_chan=i+1;
 
 				if (IS_T1_CARD(card)){
-					if (test_bit(i,&card->u.b.cfg.rbs_map)){
+					if (wan_test_bit(i,&card->u.b.cfg.rbs_map)){
 						bstrm_priv_area->rbs_on=1;
 					}
 				}
diff --git a/patches/kdrivers/src/net/sdla_bscstrm.c b/patches/kdrivers/src/net/sdla_bscstrm.c
index 091ed11..52aa9ca 100644
--- a/patches/kdrivers/src/net/sdla_bscstrm.c
+++ b/patches/kdrivers/src/net/sdla_bscstrm.c
@@ -292,7 +292,7 @@ int wp_bscstrm_init (sdla_t* card, wandev_conf_t* conf)
 	printk(KERN_INFO "%s: Bisync Streaming Config: \n",card->devname);
 	printk(KERN_INFO "%s:     Comm Port         = %s\n",
 			card->devname,card->wandev.comm_port==0?"PRI":"SEC");
-	printk(KERN_INFO "%s:     Baud Rate         = %lu\n",
+	printk(KERN_INFO "%s:     Baud Rate         = %u\n",
 			card->devname,card->wandev.bscstrm_cfg.baud_rate);
 	printk(KERN_INFO "%s:     Adapter Frequency = %lu\n",
 			card->devname,card->wandev.bscstrm_cfg.adapter_frequency);
diff --git a/patches/kdrivers/src/net/sdla_chdlc.c b/patches/kdrivers/src/net/sdla_chdlc.c
index b175f32..918d37a 100644
--- a/patches/kdrivers/src/net/sdla_chdlc.c
+++ b/patches/kdrivers/src/net/sdla_chdlc.c
@@ -1486,7 +1486,7 @@ static int if_send (struct sk_buff* skb, netdevice_t* dev)
 	chdlc_private_area_t *chdlc_priv_area = dev->priv;
 	sdla_t *card = chdlc_priv_area->card;
 	int udp_type = 0;
-	unsigned long smp_flags;
+	unsigned long smp_flags=0;
 	int err=0;
 	unsigned char misc_Tx_bits = 0;
 
diff --git a/patches/kdrivers/src/net/sdla_mp_fr.c b/patches/kdrivers/src/net/sdla_mp_fr.c
index d0cdaba..932a99a 100644
--- a/patches/kdrivers/src/net/sdla_mp_fr.c
+++ b/patches/kdrivers/src/net/sdla_mp_fr.c
@@ -1345,7 +1345,7 @@ static int if_send (struct sk_buff* skb, netdevice_t* dev)
 	fr_private_area_t *chan = dev->priv;
 	sdla_t *card = chan->card;
 	//int udp_type = 0;
-	unsigned long smp_flags;
+	unsigned long smp_flags=0;
 	int err=0;
 
 #if defined(LINUX_2_4)||defined(LINUX_2_6)
diff --git a/patches/kdrivers/src/net/sdla_ppp.c b/patches/kdrivers/src/net/sdla_ppp.c
index e3dd25d..b5cacf2 100644
--- a/patches/kdrivers/src/net/sdla_ppp.c
+++ b/patches/kdrivers/src/net/sdla_ppp.c
@@ -1048,7 +1048,7 @@ static int if_send (struct sk_buff *skb, netdevice_t *dev)
 	ppp_private_area_t *ppp_priv_area = dev->priv;
 	sdla_t *card = ppp_priv_area->card;
 	unsigned char *sendpacket;
-	unsigned long smp_flags;
+	unsigned long smp_flags=0;
 	int udp_type;
 	int err=0;
 	
diff --git a/patches/kdrivers/src/net/wanpipe_multppp.c b/patches/kdrivers/src/net/wanpipe_multppp.c
index c6b7d21..584e6bb 100644
--- a/patches/kdrivers/src/net/wanpipe_multppp.c
+++ b/patches/kdrivers/src/net/wanpipe_multppp.c
@@ -1192,7 +1192,7 @@ static int if_send (struct sk_buff* skb, netdevice_t* dev)
 	private_area_t *chan = dev->priv;
 	sdla_t *card = chan->card;
 	int udp_type = 0;
-	unsigned long smp_flags;
+	unsigned long smp_flags=0;
 	int err=0;
 
 	if (skb == NULL){
@@ -3497,7 +3497,7 @@ static void wp_bh (unsigned long data)
 				memset(rx_hdr,0,sizeof(api_rx_hdr_t));
 			}else{
 				if (WAN_NET_RATELIMIT()){
-				DEBUG_EVENT("%s: Error Rx pkt headroom %d < %d\n",
+				DEBUG_EVENT("%s: Error Rx pkt headroom %d < %u\n",
 						chan->if_name,
 						wan_skb_headroom(skb),
 						sizeof(api_rx_hdr_t));
diff --git a/patches/kdrivers/src/net/wanpipe_syncppp.c b/patches/kdrivers/src/net/wanpipe_syncppp.c
index 1d7cb59..2ebd20a 100644
--- a/patches/kdrivers/src/net/wanpipe_syncppp.c
+++ b/patches/kdrivers/src/net/wanpipe_syncppp.c
@@ -1513,7 +1513,7 @@ static void sppp_lcp_input (struct sppp *sp, struct sk_buff *skb)
 	struct net_device *dev = sp->pp_if;
 	int len = skb->len;
 	u8 *p, opt[6];
-	u32 rmagic;
+	u32 rmagic=0;
 	int rc_from_lcp_options = 0;
 
 	if (len < 4) {
diff --git a/patches/kdrivers/src/wan_aften/wan_aften_src.o b/patches/kdrivers/src/wan_aften/wan_aften_src.o
index dd4b410..17f1f1b 100644
Binary files a/patches/kdrivers/src/wan_aften/wan_aften_src.o and b/patches/kdrivers/src/wan_aften/wan_aften_src.o differ
diff --git a/patches/kdrivers/src/wan_aften/wanpipe_linux_iface.o b/patches/kdrivers/src/wan_aften/wanpipe_linux_iface.o
index ad13b16..3adea04 100644
Binary files a/patches/kdrivers/src/wan_aften/wanpipe_linux_iface.o and b/patches/kdrivers/src/wan_aften/wanpipe_linux_iface.o differ
diff --git a/patches/kdrivers/src/wanrouter/.af_wanpipe_src.o.d b/patches/kdrivers/src/wanrouter/.af_wanpipe_src.o.d
new file mode 100644
index 0000000..9f2adf5
--- /dev/null
+++ b/patches/kdrivers/src/wanrouter/.af_wanpipe_src.o.d
@@ -0,0 +1,157 @@
+af_wanpipe_src.o:  \
+ /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/src/net/../wanrouter/af_wanpipe_src.c \
+  include/linux/autoconf.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe_includes.h \
+  include/linux/init.h include/linux/compiler.h \
+  include/linux/compiler-gcc4.h include/linux/compiler-gcc.h \
+  include/linux/version.h include/linux/module.h include/linux/sched.h \
+  include/linux/auxvec.h include/asm/auxvec.h include/asm/param.h \
+  include/linux/capability.h include/linux/types.h \
+  include/linux/posix_types.h include/linux/stddef.h \
+  include/asm/posix_types.h include/asm/types.h include/linux/spinlock.h \
+  include/linux/preempt.h include/linux/thread_info.h \
+  include/linux/bitops.h include/asm/bitops.h include/asm/alternative.h \
+  include/asm-generic/bitops/sched.h include/asm-generic/bitops/hweight.h \
+  include/asm-generic/bitops/fls64.h \
+  include/asm-generic/bitops/ext2-non-atomic.h \
+  include/asm-generic/bitops/le.h include/asm/byteorder.h \
+  include/linux/byteorder/little_endian.h include/linux/byteorder/swab.h \
+  include/linux/byteorder/generic.h include/asm-generic/bitops/minix.h \
+  include/asm/thread_info.h include/asm/page.h \
+  include/asm-generic/memory_model.h include/asm-generic/page.h \
+  include/asm/processor.h include/asm/vm86.h include/asm/math_emu.h \
+  include/asm/sigcontext.h include/asm/segment.h include/asm/cpufeature.h \
+  include/asm/msr.h include/asm/system.h include/linux/kernel.h \
+  /usr/lib/gcc/i386-redhat-linux/4.1.1/include/stdarg.h \
+  include/linux/linkage.h include/asm/linkage.h include/asm/bug.h \
+  include/asm-generic/bug.h include/linux/irqflags.h \
+  include/asm/irqflags.h include/linux/cache.h include/asm/cache.h \
+  include/linux/threads.h include/asm/percpu.h \
+  include/asm-generic/percpu.h include/linux/cpumask.h \
+  include/linux/bitmap.h include/linux/string.h include/asm/string.h \
+  include/linux/stringify.h include/linux/spinlock_types.h \
+  include/linux/lockdep.h include/linux/list.h include/linux/poison.h \
+  include/linux/prefetch.h include/linux/debug_locks.h \
+  include/linux/stacktrace.h include/asm/spinlock_types.h \
+  include/asm/spinlock.h include/asm/atomic.h \
+  include/asm-generic/atomic.h include/asm/rwlock.h \
+  include/linux/spinlock_api_smp.h include/asm/current.h \
+  include/linux/timex.h include/linux/time.h include/linux/seqlock.h \
+  include/asm/timex.h include/asm/tsc.h include/linux/jiffies.h \
+  include/linux/calc64.h include/asm/div64.h include/linux/rbtree.h \
+  include/linux/errno.h include/asm/errno.h include/asm-generic/errno.h \
+  include/asm-generic/errno-base.h include/linux/nodemask.h \
+  include/linux/numa.h include/asm/semaphore.h include/linux/wait.h \
+  include/linux/rwsem.h include/asm/rwsem.h include/asm/ptrace.h \
+  include/asm/mmu.h include/asm/cputime.h include/asm-generic/cputime.h \
+  include/linux/smp.h include/asm/smp.h include/asm/fixmap.h \
+  include/asm/acpi.h include/acpi/pdc_intel.h include/asm/apicdef.h \
+  include/asm/kmap_types.h include/asm/mpspec.h include/asm/mpspec_def.h \
+  include/asm-i386/mach-generic/mach_mpspec.h include/asm/io_apic.h \
+  include/asm/apic.h include/linux/pm.h \
+  include/asm-i386/mach-generic/mach_apicdef.h include/asm/genapic.h \
+  include/linux/sem.h include/linux/ipc.h include/asm/ipcbuf.h \
+  include/asm/sembuf.h include/linux/signal.h include/asm/signal.h \
+  include/asm-generic/signal.h include/asm/siginfo.h \
+  include/asm-generic/siginfo.h include/linux/securebits.h \
+  include/linux/fs_struct.h include/linux/completion.h \
+  include/linux/pid.h include/linux/rcupdate.h include/linux/percpu.h \
+  include/linux/slab.h include/linux/gfp.h include/linux/mmzone.h \
+  include/linux/memory_hotplug.h include/linux/notifier.h \
+  include/linux/mutex.h include/linux/topology.h include/asm/topology.h \
+  include/asm-generic/topology.h include/linux/kmalloc_sizes.h \
+  include/linux/seccomp.h include/linux/futex.h include/linux/rtmutex.h \
+  include/linux/plist.h include/linux/param.h include/linux/resource.h \
+  include/asm/resource.h include/asm-generic/resource.h \
+  include/linux/timer.h include/linux/hrtimer.h include/linux/ktime.h \
+  include/linux/aio.h include/linux/workqueue.h include/linux/aio_abi.h \
+  include/linux/sysdev.h include/linux/kobject.h include/linux/sysfs.h \
+  include/linux/kref.h include/linux/stat.h include/asm/stat.h \
+  include/linux/kmod.h include/linux/elf.h include/linux/elf-em.h \
+  include/asm/elf.h include/asm/user.h include/linux/utsname.h \
+  include/asm/desc.h include/asm/ldt.h include/linux/moduleparam.h \
+  include/asm/local.h include/asm/module.h include/linux/mm.h \
+  include/linux/prio_tree.h include/linux/fs.h include/linux/limits.h \
+  include/linux/ioctl.h include/asm/ioctl.h include/asm-generic/ioctl.h \
+  include/linux/kdev_t.h include/linux/dcache.h \
+  include/linux/radix-tree.h include/linux/quota.h \
+  include/linux/dqblk_xfs.h include/linux/dqblk_v1.h \
+  include/linux/dqblk_v2.h include/linux/nfs_fs_i.h include/linux/nfs.h \
+  include/linux/sunrpc/msg_prot.h include/linux/fcntl.h \
+  include/asm/fcntl.h include/asm-generic/fcntl.h include/linux/err.h \
+  include/linux/backing-dev.h include/asm/pgtable.h \
+  include/asm/pgtable-2level-defs.h include/asm/pgtable-2level.h \
+  include/asm-generic/pgtable-nopmd.h include/asm-generic/pgtable-nopud.h \
+  include/asm-generic/pgtable.h include/linux/page-flags.h \
+  include/linux/vmstat.h include/linux/ctype.h include/net/ip.h \
+  include/linux/ip.h include/linux/in.h include/linux/socket.h \
+  include/asm/socket.h include/asm/sockios.h include/linux/sockios.h \
+  include/linux/uio.h include/net/inet_sock.h include/net/flow.h \
+  include/linux/in6.h include/net/sock.h include/linux/netdevice.h \
+  include/linux/if.h include/linux/hdlc/ioctl.h include/linux/if_ether.h \
+  include/linux/skbuff.h include/linux/highmem.h include/asm/cacheflush.h \
+  include/asm/highmem.h include/linux/interrupt.h \
+  include/linux/irqreturn.h include/linux/hardirq.h \
+  include/linux/smp_lock.h include/asm/hardirq.h include/linux/irq.h \
+  include/asm/irq.h include/asm-i386/mach-default/irq_vectors.h \
+  include/asm-i386/mach-default/irq_vectors_limits.h include/asm/hw_irq.h \
+  include/linux/profile.h include/asm/sections.h \
+  include/asm-generic/sections.h include/linux/irq_cpustat.h \
+  include/asm/tlbflush.h include/linux/poll.h include/asm/poll.h \
+  include/asm/uaccess.h include/linux/net.h include/linux/sysctl.h \
+  include/linux/textsearch.h include/net/checksum.h \
+  include/asm/checksum.h include/linux/dmaengine.h include/linux/device.h \
+  include/linux/ioport.h include/linux/klist.h include/linux/if_packet.h \
+  include/linux/security.h include/linux/binfmts.h include/linux/shm.h \
+  include/asm/shmparam.h include/asm/shmbuf.h include/linux/msg.h \
+  include/asm/msgbuf.h include/linux/key.h include/linux/xfrm.h \
+  include/linux/filter.h include/net/dst.h include/linux/rtnetlink.h \
+  include/linux/netlink.h include/net/neighbour.h \
+  include/linux/seq_file.h include/net/request_sock.h include/net/snmp.h \
+  include/linux/snmp.h include/linux/ipv6.h include/linux/icmpv6.h \
+  include/linux/tcp.h include/net/inet_connection_sock.h \
+  include/net/inet_timewait_sock.h include/net/tcp_states.h \
+  include/net/timewait_sock.h include/linux/udp.h include/net/if_inet6.h \
+  include/net/protocol.h include/net/route.h include/net/inetpeer.h \
+  include/linux/in_route.h include/linux/route.h include/linux/wireless.h \
+  include/linux/inet.h include/asm/io.h include/asm-generic/iomap.h \
+  include/linux/vmalloc.h include/asm/delay.h include/linux/pci.h \
+  include/linux/pci_regs.h include/linux/pci_ids.h \
+  include/linux/mod_devicetable.h include/linux/dmapool.h \
+  include/asm/scatterlist.h include/asm/pci.h \
+  include/asm-generic/pci-dma-compat.h include/linux/dma-mapping.h \
+  include/asm/dma-mapping.h include/asm-generic/pci.h \
+  include/linux/if_arp.h include/linux/pkt_sched.h \
+  include/linux/etherdevice.h include/linux/random.h \
+  include/linux/inetdevice.h include/net/inet_common.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe_defines.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe_version.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe_kernel.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe_debug.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe_common.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe_events.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe_cfg.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/sdla_56k.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/sdla_te1.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/sdla_te3.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/sdla_remora.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/sdla_remora_proslic.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/sdla_front_end.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanrouter.h \
+  include/linux/proc_fs.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/sdla_tdmv.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/sdlasfm.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/sdladrv.h \
+  include/linux/serial.h include/linux/serialP.h include/linux/termios.h \
+  include/asm/termios.h include/asm/termbits.h include/asm/ioctls.h \
+  include/linux/circ_buf.h include/linux/serial_reg.h \
+  include/asm/serial.h include/linux/tty.h include/linux/major.h \
+  include/linux/tty_driver.h include/linux/cdev.h \
+  include/linux/tty_ldisc.h include/linux/tty_flip.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/if_wanpipe_kernel.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/if_wanpipe.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/if_wanpipe_common.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe_x25_kernel.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe_dsp_kernel.h \
+  /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/include/linux/wanpipe_x25_kernel.h
diff --git a/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.o b/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.o
index a4fe936..ede0a90 100644
Binary files a/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.o and b/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.o differ
diff --git a/patches/kdrivers/src/wanrouter/af_wanpipe_src.o b/patches/kdrivers/src/wanrouter/af_wanpipe_src.o
index f7e5ec1..47788a6 100644
Binary files a/patches/kdrivers/src/wanrouter/af_wanpipe_src.o and b/patches/kdrivers/src/wanrouter/af_wanpipe_src.o differ
diff --git a/patches/kdrivers/src/wanrouter/waniface.o b/patches/kdrivers/src/wanrouter/waniface.o
index fab3f93..c49539d 100644
Binary files a/patches/kdrivers/src/wanrouter/waniface.o and b/patches/kdrivers/src/wanrouter/waniface.o differ
diff --git a/patches/kdrivers/src/wanrouter/wanmain.o b/patches/kdrivers/src/wanrouter/wanmain.o
index cb31e91..52b1da8 100644
Binary files a/patches/kdrivers/src/wanrouter/wanmain.o and b/patches/kdrivers/src/wanrouter/wanmain.o differ
diff --git a/patches/kdrivers/src/wanrouter/wanproc.o b/patches/kdrivers/src/wanrouter/wanproc.o
index 17688d6..0496743 100644
Binary files a/patches/kdrivers/src/wanrouter/wanproc.o and b/patches/kdrivers/src/wanrouter/wanproc.o differ
diff --git a/patches/kdrivers/wanec/.tmp_versions/wanec.mod b/patches/kdrivers/wanec/.tmp_versions/wanec.mod
index 96392b7..24b40f1 100644
--- a/patches/kdrivers/wanec/.tmp_versions/wanec.mod
+++ b/patches/kdrivers/wanec/.tmp_versions/wanec.mod
@@ -1,2 +1,2 @@
-/root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/wanec.ko
-/root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/wanec_iface.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/wanec_cmd.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/wanec_utils.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/wanec_dev.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/apilib/bt/octapi_bt0.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/apilib/largmath/octapi_largmath.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/apilib/llman/octapi_llman.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_events.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.o /root/development/3.2/wanpipe-3.2.0/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_user.o
+/root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/wanec.ko
+/root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/wanec_iface.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/wanec_cmd.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/wanec_utils.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/wanec_dev.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/apilib/bt/octapi_bt0.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/apilib/largmath/octapi_largmath.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/apilib/llman/octapi_llman.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_apimi/oct6100_mask_interrupts.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_adpcm_chan.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_channel.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_stats.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_conf_bridge.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_debug.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_events.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_interrupts.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_memory.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_miscellaneous.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_mixer.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_phasing_tsst.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_playout_buf.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_remote_debug.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tlv.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tone_detection.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tsi_cnct.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_tsst.o /root/development/3.2/wanpipe-3.2.1/patches/kdrivers/wanec/oct6100_api/octdeviceapi/oct6100api/oct6100_api/oct6100_user.o
diff --git a/rpmspec/wanpipe-mod.spec b/rpmspec/wanpipe-mod.spec
index 977326e..b71119b 100644
--- a/rpmspec/wanpipe-mod.spec
+++ b/rpmspec/wanpipe-mod.spec
@@ -1,6 +1,6 @@
 %define WANPIPE_VER	  wanpipe-modules
 %define name              %{WANPIPE_VER}
-%define version           3.2.0
+%define version           3.2.1
 %define release           0
 %define	serial	 	  1
 %define MODULES_DIR	  /lib/modules
diff --git a/rpmspec/wanpipe-util.spec b/rpmspec/wanpipe-util.spec
index 18094e2..13201fb 100644
--- a/rpmspec/wanpipe-util.spec
+++ b/rpmspec/wanpipe-util.spec
@@ -1,7 +1,7 @@
 %define KERNEL_VERSION    %{?kern_ver}
 %define WANPIPE_VER	  wanpipe-util
 %define name              %{WANPIPE_VER}
-%define version           3.2.0
+%define version           3.2.1
 %define release           0
 %define	serial	 	  1
 %define UTILS_DIR 	  /usr/sbin
diff --git a/rpmspec/wanpipe.spec b/rpmspec/wanpipe.spec
index 95b1aa3..7731c1a 100644
--- a/rpmspec/wanpipe.spec
+++ b/rpmspec/wanpipe.spec
@@ -1,7 +1,7 @@
 %define KERNEL_VERSION    %{?kern_ver}
 %define WANPIPE_VER	  wanpipe
 %define name              %{WANPIPE_VER}
-%define version           3.2.0
+%define version           3.2.1
 %define release           0
 %define	serial	 	  1
 %define UTILS_DIR 	  /usr/sbin
diff --git a/samples/wanrouter b/samples/wanrouter
index 58da168..1f02e8f 100644
--- a/samples/wanrouter
+++ b/samples/wanrouter
@@ -2116,7 +2116,7 @@ WANPIPE_IS_RUNNING=/var/run/wanpipe_is_running
 RUGGEDCOM=No
 
 if [ $OSYSTEM = "Linux" ]; then
-	ROUTER_VERSION=3.2.0
+	ROUTER_VERSION=3.2.1
 	IFCONFIG_LIST=ifconfig
 	MODULE_STAT=lsmod
 	WAN_DRIVERS="wanpipe"
diff --git a/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/all-wcprops b/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/all-wcprops
index eedb357..4a29419 100644
--- a/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/all-wcprops
+++ b/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/all-wcprops
@@ -1,13 +1,13 @@
 K 25
 svn:wc:ra_dav:version-url
 V 34
-/svn/chan_woomera/!svn/ver/5/trunk
+/svn/chan_woomera/!svn/ver/6/trunk
 END
 chan_woomera.c
 K 25
 svn:wc:ra_dav:version-url
 V 49
-/svn/chan_woomera/!svn/ver/5/trunk/chan_woomera.c
+/svn/chan_woomera/!svn/ver/6/trunk/chan_woomera.c
 END
 g711.h
 K 25
diff --git a/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/entries b/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/entries
index 066c9f0..7e7ce38 100644
--- a/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/entries
+++ b/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/entries
@@ -1,14 +1,14 @@
 8
 
 dir
-5
+6
 https://www.sangomapbx.com:/svn/chan_woomera/trunk
 https://www.sangomapbx.com:/svn/chan_woomera
 
 
 
-2007-09-25T01:20:39.612148Z
-5
+2007-10-02T20:33:46.624857Z
+6
 ncorbic
 
 
@@ -32,10 +32,10 @@ file
 
 
 
-2007-09-25T01:22:28.000000Z
-d5c8cb6e88e6df7f3eb5431b2c4005c7
-2007-09-25T01:20:39.612148Z
-5
+2007-10-07T16:40:41.000000Z
+7dcba9f7acaf61774093ca6b7fb3d102
+2007-10-02T20:33:46.624857Z
+6
 ncorbic
 
 g711.h
diff --git a/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/text-base/chan_woomera.c.svn-base b/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/text-base/chan_woomera.c.svn-base
index a679441..2027153 100644
--- a/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/text-base/chan_woomera.c.svn-base
+++ b/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/.svn/text-base/chan_woomera.c.svn-base
@@ -4155,7 +4155,20 @@ int unload_module(void)
 	return 0;
 }
 
-#ifdef AST14
+#ifndef AST14
+
+char *key()
+{
+        return ASTERISK_GPL_KEY;
+}
+
+/* returns a descriptive string to the system console */
+char *description()
+{
+        return (char *) desc;
+}
+
+#else
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Woomera Protocol (WOOMERA)",
 		.load = load_module,
 		.unload = unload_module,
diff --git a/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/chan_woomera.c b/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/chan_woomera.c
index a679441..2027153 100644
--- a/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/chan_woomera.c
+++ b/ssmg/sangoma_mgd.trunk/chan_woomera.trunk/chan_woomera.c
@@ -4155,7 +4155,20 @@ int unload_module(void)
 	return 0;
 }
 
-#ifdef AST14
+#ifndef AST14
+
+char *key()
+{
+        return ASTERISK_GPL_KEY;
+}
+
+/* returns a descriptive string to the system console */
+char *description()
+{
+        return (char *) desc;
+}
+
+#else
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Woomera Protocol (WOOMERA)",
 		.load = load_module,
 		.unload = unload_module,