wanpipe-7.0.34.tgz

.git_info

@@ -1,2 +1,2 @@
-wanpipe_linux: git ver 3b8482c
+wanpipe_linux: git ver 94b4102
-wanpipe_common: git ver e5ec437
+wanpipe_common: git ver fdc6185

.router_version

@@ -1 +1 @@
-wanpipe-7.0.33
+wanpipe-7.0.34

Makefile

@@ -355,6 +355,17 @@ KERN_TIMER_32BIT=0
 EXTRA_CFLAGS+=-DKERN_TIMER_32BIT=$(KERN_TIMER_32BIT)
 endif
 
+ifneq (,$(wildcard $(KDIR)/scripts/mod/modpost.c))
+KERN_MODPOST_STATIC_ERR=$(shell grep -nr "is a static " $(KDIR)/scripts/mod/modpost.c | grep error -c)
+EXTRA_CFLAGS+=-DKERN_MODPOST_STATIC_ERR=$(KERN_MODPOST_STATIC_ERR)
+else ifneq (,$(wildcard $(KSRC)/scripts/mod/modpost.c))
+KERN_MODPOST_STATIC_ERR=$(shell grep -nr "is a static " $(KSRC)/scripts/mod/modpost.c | grep error -c)
+EXTRA_CFLAGS+=-DKERN_MODPOST_STATIC_ERR=$(KERN_MODPOST_STATIC_ERR)
+else
+KERN_MODPOST_STATIC_ERR=0
+EXTRA_CFLAGS+=-DKERN_MODPOST_STATIC_ERR=$(KERN_MODPOST_STATIC_ERR)
+endif
+
 # First pass, kernel Makefile reads module objects
 ifneq ($(KERNELRELEASE),)
 obj-m := sdladrv.o wanrouter.o wanpipe.o wanpipe_syncppp.o wanec.o 

Setup

@@ -541,6 +541,29 @@ check_kern_ds ()
 	fi
 	PROTOCOL_DEFINES="$PROTOCOL_DEFINES $KERN_DS_UPDATE "
 }
+
+check_kern_modpost ()
+{
+	if [ -e $SOURCEDIR/scripts/mod/modpost.c ];then
+		eval "grep \"is a static \" $SOURCEDIR/scripts/mod/modpost.c | grep error >/dev/null 2>/dev/null"
+		if [ $? -eq 0 ]; then
+			KERN_MODPOST_UPDATE="-DKERN_MODPOST_STATIC_ERR=1"
+		else
+			KERN_MODPOST_UPDATE="-DKERN_MODPOST_STATIC_ERR=0"
+		fi
+	elif [ -e $DEBSRCDIR/scripts/mod/modpost.c ];then
+		eval "grep \"is a static \" $DEBSRCDIR/scripts/mod/modpost.c | grep error >/dev/null 2>/dev/null"
+		if [ $? -eq 0 ]; then
+			KERN_MODPOST_UPDATE="-DKERN_MODPOST_STATIC_ERR=1"
+		else
+			KERN_MODPOST_UPDATE="-DKERN_MODPOST_STATIC_ERR=0"
+		fi
+	else
+		KERN_MODPOST_UPDATE="-DKERN_MODPOST_STATIC_ERR=0"
+	fi
+	PROTOCOL_DEFINES="$PROTOCOL_DEFINES $KERN_MODPOST_UPDATE "
+}
+
 # ----------------------------------------------------------------------------
 # Display error message.
 # ----------------------------------------------------------------------------
@@ -3978,6 +4001,8 @@ CFLAGS="$CC -Wp,-MD,.wanpipe.o.d -nostdinc -iwithprefix include -D__LINUX__ -Dli
 
 		check_kern_ds
 
+		check_kern_modpost
+
 		if [ "$BRI_MODULE_TEST" = "YES" ]; then
 			PROTOCOL_DEFINES="$PROTOCOL_DEFINES -DBUILD_MOD_TESTER"
 		fi
@@ -7761,7 +7786,7 @@ KERNEL_UNAME=`uname -r`
 PKG_NAME=wanpipe
 DISTR_NAME="WANPIPE"
 PROD=wanrouter
-PROD_VER=7.0.33
+PROD_VER=7.0.34
 PROD_HOME=`pwd`
 META_CONF=$PROD_HOME/$PROD.rc
 WAN_INTR_DIR=$PROD_HOME/interfaces

deb_control/wanpipe.deb

@@ -1,5 +1,5 @@
 Package: wanpipe
-Version: 7.0.33-0
+Version: 7.0.34-0
 Section: networking
 Priority: optional
 Architecture: all

patches/kdrivers/include/wanpipe_cdev_iface.h

@@ -103,6 +103,11 @@ typedef struct wanpipe_cdev_priv
 
 # define CPRIV(dev)  ((wanpipe_cdev_priv_t*)(dev->priv))
 
+#if defined (KERN_MODPOST_STATIC_ERR) && KERN_MODPOST_STATIC_ERR > 0
+int wanpipe_cdev_tx_wake(wanpipe_cdev_t *cdev);
+int wanpipe_cdev_rx_wake(wanpipe_cdev_t *cdev);
+int wanpipe_cdev_event_wake(wanpipe_cdev_t *cdev);
+#else
 static __inline int  wanpipe_cdev_rx_wake(wanpipe_cdev_t *cdev)
 {
 	if (!cdev || !CPRIV(cdev)) {
@@ -145,6 +150,7 @@ static __inline int  wanpipe_cdev_event_wake(wanpipe_cdev_t *cdev)
 
 	return 0;
 }
+#endif
 #else
 int wanpipe_cdev_tx_wake(wanpipe_cdev_t *cdev);
 int wanpipe_cdev_rx_wake(wanpipe_cdev_t *cdev);

patches/kdrivers/include/wanpipe_version.h

@@ -10,14 +10,14 @@
 #define WANPIPE_COMPANY         "Sangoma Technologies Inc"
 
 /********** LINUX **********/
-#define WANPIPE_VERSION			"7.0.33"
+#define WANPIPE_VERSION			"7.0.34"
 #define WANPIPE_SUB_VERSION				"0"
 #define WANPIPE_LITE_VERSION			"1.1.1"
 
 #if defined(__LINUX__)
 #define WANPIPE_VERSION_MAJOR			7
 #define WANPIPE_VERSION_MINOR			0
-#define WANPIPE_VERSION_MINOR1			33
+#define WANPIPE_VERSION_MINOR1			34
 #define WANPIPE_VERSION_MINOR2			0
 #endif
 

patches/kdrivers/src/net/wanpipe_cdev_linux.c

@@ -470,7 +470,50 @@ int wanpipe_cdev_free(wanpipe_cdev_t *cdev)
 	return  wanpipe_free_cdev(cdev, minor,counter);
 }
 
+#if defined (KERN_MODPOST_STATIC_ERR) && KERN_MODPOST_STATIC_ERR > 0
+int  wanpipe_cdev_rx_wake(wanpipe_cdev_t *cdev)
+{
+        if (!cdev || !CPRIV(cdev)) {
+                DEBUG_EVENT("%s(): Error cdev->dev_ptr not initialized!\n",__FUNCTION__);
+                return -1;
+        }
 
+        if (waitqueue_active(&CPRIV(cdev)->poll_wait)){
+                wake_up_interruptible(&CPRIV(cdev)->poll_wait);
+        }
+
+        return 0;
+}
+
+
+int wanpipe_cdev_tx_wake(wanpipe_cdev_t *cdev)
+{
+        if (!cdev || !CPRIV(cdev)) {
+                DEBUG_EVENT("%s(): Error cdev->dev_ptr not initialized!\n",__FUNCTION__);
+                return -1;
+        }
+
+        if (waitqueue_active(&CPRIV(cdev)->poll_wait)){
+                wake_up_interruptible(&CPRIV(cdev)->poll_wait);
+        }
+
+        return 0;
+}
+
+int  wanpipe_cdev_event_wake(wanpipe_cdev_t *cdev)
+{
+        if (!cdev || !CPRIV(cdev)) {
+                DEBUG_EVENT("%s(): Error cdev->dev_ptr not initialized!\n",__FUNCTION__);
+                return -1;
+        }
+
+        if (waitqueue_active(&CPRIV(cdev)->poll_wait)){
+                wake_up_interruptible(&CPRIV(cdev)->poll_wait);
+        }
+
+        return 0;
+}
+#endif
 
 
 /*=========================================================

patches/kdrivers/src/wanrouter/af_wanpipe.c

@@ -1787,7 +1787,7 @@ static int wanpipe_getname(struct socket *sock, struct sockaddr *uaddr,
 	return 0;
 }
 
-#if (KERN_SOCK_NO_OPT == 0)
+#if (SOCK_NO_OPT == 0)
 static int sock_no_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval, unsigned int optlen)
 {
 	return -EOPNOTSUPP;

rpmspec/wanpipe-mod.rpmspec

@@ -1,6 +1,6 @@
 %define WANPIPE_VER	  wanpipe-modules
 %define name              %{WANPIPE_VER}
-%define version           7.0.33
+%define version           7.0.34
 %define release           0
 %define	serial	 	  1
 %define MODULES_DIR	  /lib/modules

rpmspec/wanpipe-util.rpmspec

@@ -1,6 +1,6 @@
 %define WANPIPE_VER	  wanpipe-util
 %define name              %{WANPIPE_VER}
-%define version           7.0.33
+%define version           7.0.34
 %define release           0
 %define	serial	 	  1
 %define UTILS_DIR 	  /usr/sbin

rpmspec/wanpipe.rpmspec

@@ -1,7 +1,7 @@
 %define KERNEL_VERSION    %{?kern_ver}
 %define WANPIPE_VER	  wanpipe
 %define name              %{WANPIPE_VER}
-%define version           7.0.33
+%define version           7.0.34
 %define release           0
 %define	serial	 	  1
 %define UTILS_DIR 	  /usr/sbin

samples/wanrouter

@@ -2241,7 +2241,7 @@ init_global_params()
 {
 
 	if [ $OSYSTEM = "Linux" ]; then
-		ROUTER_VERSION=7.0.33
+		ROUTER_VERSION=7.0.34
 		IFCONFIG_LIST=ifconfig
 		MODULE_STAT=lsmod
 		WAN_DRIVERS="wanpipe"

util/wanpipemon/dslpipemon.c

@@ -77,7 +77,6 @@ extern int		sock;
 extern wan_udp_hdr_t 	wan_udp;
 extern int		protocol_cb_size;
 extern int 		trace_all_data;
-unsigned int 		loop_counter, frame_count;
 
 /******************************************************************************
  * 			FUNCTION PROTOTYPES				      *

util/wanpipemon/wanpipemon.c

@@ -185,7 +185,6 @@ char TRACE_ASCII=0;
 char TRACE_HEX=0;
 
 char *cmd[MAX_CMD_ARG];
-FT1_LED_STATUS FT1_LED;
 
 /******************************************************************************
  * 			FUNCTION PROTOTYPES				      *
@@ -209,7 +208,6 @@ static char*	GetMasterDevName( void );
 #if 0
 static void 	sig_handler(int sigint);
 #endif
-int      	fail=0;
 int 		xml_output=0;
 //static sa_family_t	get_if_family(char*);
 

util/wanpipemon/xpipemon.c

@@ -67,7 +67,6 @@ void flush_hdlc_stat(void);
 /* global for now */
 static unsigned char      station_config;
 int                off_counter, green_counter, red_counter;
-int                loop_counter, fail;
 
 /* defines for now */
 extern int lcn_number;

util/wanpipemon_legacy/dslpipemon.c

@@ -82,7 +82,6 @@ extern int		sock;
 extern wan_udp_hdr_t 	wan_udp;
 extern int		protocol_cb_size;
 extern int 		trace_all_data;
-unsigned int 		loop_counter, frame_count;
 
 /******************************************************************************
  * 			FUNCTION PROTOTYPES				      *

util/wanpipemon_legacy/wanpipemon_legacy.c

@@ -130,7 +130,6 @@ char TRACE_ASCII=0;
 char TRACE_HEX=0;
 
 char *cmd[MAX_CMD_ARG];
-FT1_LED_STATUS FT1_LED;
 
 /******************************************************************************
  * 			FUNCTION PROTOTYPES				      *
@@ -148,7 +147,6 @@ static int 	GetWANConfig(void);
 #if 0
 static void 	sig_handler(int sigint);
 #endif
-int      	fail=0;
 int 		xml_output=0;
 //static sa_family_t	get_if_family(char*);
 

util/wanpipemon_legacy/xpipemon.c

@@ -64,7 +64,6 @@ void flush_hdlc_stat(void);
 /* global for now */
 static unsigned char      station_config;
 int                off_counter, green_counter, red_counter;
-int                loop_counter, fail;
 
 /* defines for now */
 extern int lcn_number;

wanpipe.spec

@@ -25,7 +25,7 @@
 #
 
 %define NAME			wanpipe
-%define VERSION           7.0.33
+%define VERSION           7.0.34
 %define RELEASE			0
 %define KVERSION		%{?kernel}
 %define KSRC			%{?ksrc}