From fbbdc67f33f1bd2fdd1e9e542ce2f00b51c720b7 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 29 Dec 2021 18:57:55 +0100 Subject: [PATCH] wanpipe-7.0.5.tgz --- .git_info | 2 +- .router_version | 2 +- ChangeLog | 2 +- Setup | 2 +- deb_control/wanpipe.deb | 2 +- patches/kdrivers/include/wanpipe_version.h | 4 ++-- patches/kdrivers/src/net/aft_core.c | 13 ++++++------- patches/kdrivers/wanec/wanec_iface.c | 3 ++- rpmspec/wanpipe-mod.rpmspec | 4 ++-- rpmspec/wanpipe-util.rpmspec | 4 ++-- rpmspec/wanpipe.rpmspec | 4 ++-- samples/wanrouter | 2 +- wanpipe.spec | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.git_info b/.git_info index 8e88863..bb745ea 100644 --- a/.git_info +++ b/.git_info @@ -1,2 +1,2 @@ wanpipe_linux: git ver b2503d8 -wanpipe_common: git ver 111806d +wanpipe_common: git ver 9b182f2 diff --git a/.router_version b/.router_version index b935fad..a77e6f4 100644 --- a/.router_version +++ b/.router_version @@ -1 +1 @@ -wanpipe-7.0.4 +wanpipe-7.0.5 diff --git a/ChangeLog b/ChangeLog index 2d887cf..1dfce34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,7 +8,7 @@ Copyright (c) 1995-2013 Sangoma Technologies Inc. For more info visit: http://wiki.sangoma.com ------------------------------------------------------------------------------ -* Mon Jul 15 2013 Nenad Corbic - 7.0.4 +* Mon Jul 15 2013 Nenad Corbic - 7.0.5 ================================================================== - Updated for Dahdi 2.7 diff --git a/Setup b/Setup index 31ec4ca..90d1c0e 100755 --- a/Setup +++ b/Setup @@ -7338,7 +7338,7 @@ KERNEL_UNAME=`uname -r` PKG_NAME=wanpipe DISTR_NAME="WANPIPE" PROD=wanrouter -PROD_VER=7.0.4 +PROD_VER=7.0.5 PROD_HOME=`pwd` META_CONF=$PROD_HOME/$PROD.rc WAN_INTR_DIR=$PROD_HOME/interfaces diff --git a/deb_control/wanpipe.deb b/deb_control/wanpipe.deb index 8017b5d..ad6e293 100644 --- a/deb_control/wanpipe.deb +++ b/deb_control/wanpipe.deb @@ -1,5 +1,5 @@ Package: wanpipe -Version: 7.0.4-0 +Version: 7.0.5-0 Section: networking Priority: optional Architecture: all diff --git a/patches/kdrivers/include/wanpipe_version.h b/patches/kdrivers/include/wanpipe_version.h index 2b81798..ac734ed 100644 --- a/patches/kdrivers/include/wanpipe_version.h +++ b/patches/kdrivers/include/wanpipe_version.h @@ -10,14 +10,14 @@ #define WANPIPE_COMPANY "Sangoma Technologies Inc" /********** LINUX **********/ -#define WANPIPE_VERSION "7.0.4" +#define WANPIPE_VERSION "7.0.5" #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 4 +#define WANPIPE_VERSION_MINOR1 5 #define WANPIPE_VERSION_MINOR2 0 #endif diff --git a/patches/kdrivers/src/net/aft_core.c b/patches/kdrivers/src/net/aft_core.c index 50b44f9..aa8fbda 100644 --- a/patches/kdrivers/src/net/aft_core.c +++ b/patches/kdrivers/src/net/aft_core.c @@ -3575,7 +3575,12 @@ static int del_if_private (wan_device_t* wandev, netdevice_t* dev) wan_netif_name(dev)); return 0; } - + + if (aft_tdm_api_free(card,chan)) { + DEBUG_ERROR("%s: Error: Failed to del iface: TDM API Device in use!\n", + chan->if_name); + return -EBUSY; + } #ifdef CONFIG_PRODUCT_WANPIPE_ANNEXG if (chan->common.usedby == ANNEXG && chan->annexg_dev) { @@ -3620,12 +3625,6 @@ static int del_if_private (wan_device_t* wandev, netdevice_t* dev) wan_unreg_api(chan, card->devname); } - if (aft_tdm_api_free(card,chan)) { - DEBUG_ERROR("%s: Error: Failed to del iface: TDM API Device in use!\n", - chan->if_name); - return -EBUSY; - } - wan_spin_lock_irq(&card->wandev.lock,&flags); aft_tdmv_if_free(card,chan); wan_spin_unlock_irq(&card->wandev.lock,&flags); diff --git a/patches/kdrivers/wanec/wanec_iface.c b/patches/kdrivers/wanec/wanec_iface.c index 5d80b2c..87c669a 100644 --- a/patches/kdrivers/wanec/wanec_iface.c +++ b/patches/kdrivers/wanec/wanec_iface.c @@ -928,10 +928,11 @@ int wanec_api_release(wan_ec_dev_t *ec_dev, wan_ec_api_t *ec_api, int verbose) if (!(ec_dev->fe_channel_map & (1 << fe_chan))){ continue; } - if (ec_dev->fe_media == WAN_MEDIA_E1 && fe_chan == 0) continue; ec_chan = wanec_fe2ec_channel(ec_dev, fe_chan); wanec_bypass(ec_dev, fe_chan, 0, 0); + + if (ec_dev->fe_media == WAN_MEDIA_E1 && fe_chan == 0) continue; wanec_ChannelClose(ec_dev, ec_chan, verbose); } } diff --git a/rpmspec/wanpipe-mod.rpmspec b/rpmspec/wanpipe-mod.rpmspec index 76f3183..c665025 100644 --- a/rpmspec/wanpipe-mod.rpmspec +++ b/rpmspec/wanpipe-mod.rpmspec @@ -1,6 +1,6 @@ %define WANPIPE_VER wanpipe-modules %define name %{WANPIPE_VER} -%define version 7.0.4 +%define version 7.0.5 %define release 0 %define serial 1 %define MODULES_DIR /lib/modules @@ -59,7 +59,7 @@ fi %changelog -* Mon Jul 15 2013 Nenad Corbic - 7.0.4 +* Mon Jul 15 2013 Nenad Corbic - 7.0.5 ================================================================== - Updated for Dahdi 2.7 diff --git a/rpmspec/wanpipe-util.rpmspec b/rpmspec/wanpipe-util.rpmspec index 39f0955..611ef1e 100644 --- a/rpmspec/wanpipe-util.rpmspec +++ b/rpmspec/wanpipe-util.rpmspec @@ -1,6 +1,6 @@ %define WANPIPE_VER wanpipe-util %define name %{WANPIPE_VER} -%define version 7.0.4 +%define version 7.0.5 %define release 0 %define serial 1 %define UTILS_DIR /usr/sbin @@ -229,7 +229,7 @@ chmod 755 /usr/local/sbin/setup-sangoma %changelog -* Mon Jul 15 2013 Nenad Corbic - 7.0.4 +* Mon Jul 15 2013 Nenad Corbic - 7.0.5 ================================================================== - Updated for Dahdi 2.7 diff --git a/rpmspec/wanpipe.rpmspec b/rpmspec/wanpipe.rpmspec index f4e3119..fe31050 100644 --- a/rpmspec/wanpipe.rpmspec +++ b/rpmspec/wanpipe.rpmspec @@ -1,7 +1,7 @@ %define KERNEL_VERSION %{?kern_ver} %define WANPIPE_VER wanpipe %define name %{WANPIPE_VER} -%define version 7.0.4 +%define version 7.0.5 %define release 0 %define serial 1 %define UTILS_DIR /usr/sbin @@ -246,7 +246,7 @@ chmod 755 /usr/local/sbin/setup-sangoma %changelog -* Mon Jul 15 2013 Nenad Corbic - 7.0.4 +* Mon Jul 15 2013 Nenad Corbic - 7.0.5 ================================================================== - Updated for Dahdi 2.7 diff --git a/samples/wanrouter b/samples/wanrouter index cde80fe..1cdd63a 100644 --- a/samples/wanrouter +++ b/samples/wanrouter @@ -2231,7 +2231,7 @@ init_global_params() { if [ $OSYSTEM = "Linux" ]; then - ROUTER_VERSION=7.0.4 + ROUTER_VERSION=7.0.5 IFCONFIG_LIST=ifconfig MODULE_STAT=lsmod WAN_DRIVERS="wanpipe" diff --git a/wanpipe.spec b/wanpipe.spec index 8bd80d6..7c1a489 100644 --- a/wanpipe.spec +++ b/wanpipe.spec @@ -25,7 +25,7 @@ # %define NAME wanpipe -%define VERSION 7.0.4 +%define VERSION 7.0.5 %define RELEASE 0 %define KVERSION %{?kernel} %define KSRC %{?ksrc} @@ -259,7 +259,7 @@ fi %changelog -* Mon Jul 15 2013 Nenad Corbic - 7.0.4 +* Mon Jul 15 2013 Nenad Corbic - 7.0.5 ================================================================== - Updated for Dahdi 2.7