summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMakefile4
-rwxr-xr-xzaptel.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 05f4c07..b72670d 100755
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ KFLAGS+=-DECHO_CAN_STEVE
#
# Uncomment for Generic PPP support (i.e. ZapRAS)
#
-#KFLAGS+=-DCONFIG_ZAPATA_PPP
+KFLAGS+=-DCONFIG_ZAPATA_PPP
#
# ISA Defaults can be set here.
#
@@ -78,7 +78,7 @@ all: $(MODULES) ztcfg torisatool makefw ztmonitor ztspeed $(ZTTOOL)
devel: tor2ee
-tests: patgen pattest
+tests: patgen pattest hdlcstress hdlctest
tor2.o: tor2.c tor2-hw.h tor.h tor2fw.h zaptel.h
gcc $(KFLAGS) -c tor2.c
diff --git a/zaptel.c b/zaptel.c
index 8c7d2a7..4896944 100755
--- a/zaptel.c
+++ b/zaptel.c
@@ -45,6 +45,7 @@
#endif /* CONFIG_ZAPATA_NET */
#include <linux/ppp_defs.h>
#ifdef CONFIG_ZAPATA_PPP
+#include <linux/netdevice.h>
#include <linux/if.h>
#include <linux/if_ppp.h>
#endif
@@ -722,7 +723,7 @@ static void close_channel(struct zt_chan *chan)
chan->eventinidx = chan->eventoutidx = 0;
chan->flags &= ~(ZT_FLAG_LINEAR | ZT_FLAG_PPP);
- zt_set_law(chan,chan->deflaw);
+ zt_set_law(chan,0);
memset(chan->conflast, 0, sizeof(chan->conflast));
memset(chan->conflast1, 0, sizeof(chan->conflast1));
@@ -1621,7 +1622,7 @@ static int initialize_channel(struct zt_chan *chan)
chan->txgain = defgain;
chan->gainalloc = 0;
chan->eventinidx = chan->eventoutidx = 0;
- zt_set_law(chan,chan->deflaw);
+ zt_set_law(chan,0);
zt_hangup(chan);
/* Make sure that the audio flag is cleared on a clear channel */