From cb7b810916c9e8089f489e641d65203c23b95f10 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 25 Jun 2002 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2002-06-25

---
 bitsy/power.c | 9 ++-------
 ip/devip.c    | 2 ++
 ip/ip.h       | 1 +
 ip/udp.c      | 2 ++
 port/devsdp.c | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bitsy/power.c b/bitsy/power.c
index 19a4601ce9a276f75e064d28fda1d862902770f5..19995ae4f0f5f6d1ce937e7a8441e73e980c8edc 100644
--- a/bitsy/power.c
+++ b/bitsy/power.c
@@ -187,15 +187,10 @@ deepsleep(void) {
 	intrcpy(&savedintrregs, intrregs);
 	cacheflush();
 	delay(50);
-//	mecr = memconfregs->mecr;
 	if(setpowerlabel()){
 		/* return here with mmu back on */
 		trapresume();
 
-		/* Turn off memory auto power */
-//		memconfregs->mdrefr &= ~0x30000000;
-//		memconfregs->mecr = mecr;
-
 		gpiorestore(gpioregs, &savedgpioregs);
 		delay(50);
 		intrcpy(intrregs, &savedintrregs);
@@ -214,10 +209,10 @@ deepsleep(void) {
 //		dumpitall();
 		delay(1000);
 //		irpower(1);
-//		audiopower(1);
+		audiopower(1);
 		µcpower(1);
 		screenpower(1);
-		pcmciapower(1);
+	//	pcmciapower(1);
 		splx(power_pl);
 		return;
 	}
diff --git a/ip/devip.c b/ip/devip.c
index 921ca6f8aa6db6e5e7ee356f3f938d5a29acc251..b8395459c539e9ebc1f9ef176969a7992fce0b17 100644
--- a/ip/devip.c
+++ b/ip/devip.c
@@ -1088,6 +1088,8 @@ ipwrite(Chan* ch, void *v, long n, vlong off)
 			ttlctlmsg(c, cb);
 		else if(strcmp(cb->f[0], "tos") == 0)
 			tosctlmsg(c, cb);
+		else if(strcmp(cb->f[0], "ignoreadvice") == 0)
+			c->ignoreadvice = 1;
 		else if(strcmp(cb->f[0], "addmulti") == 0){
 			if(cb->nf < 2)
 				error("addmulti needs interface address");
diff --git a/ip/ip.h b/ip/ip.h
index 06b5da74dbcae4f600833464c03d106b581efe03..6988183ee33321edb2e0fee24a7e4b2dedba81fb 100644
--- a/ip/ip.h
+++ b/ip/ip.h
@@ -85,6 +85,7 @@ struct Conv
 	uint	ttl;			/* max time to live */
 	uint	tos;			/* type of service */
 	uchar	ipversion;		/* IPv4 or IPv6 */
+	int	ignoreadvice;		/* don't terminate connection on icmp errors */
 
 	char	*owner;			/* protections */
 	int	perm;
diff --git a/ip/udp.c b/ip/udp.c
index d1e804f4e3c26823526c15fe7640d2a1781f3060..ce89e32790cf6f47a7a877e12df8bfc57c7b6095 100644
--- a/ip/udp.c
+++ b/ip/udp.c
@@ -587,6 +587,8 @@ udpadvise(Proto *udp, Block *bp, char *msg)
 		if(s->lport == psource)
 		if(ipcmp(s->raddr, dest) == 0)
 		if(ipcmp(s->laddr, source) == 0){
+			if(s->ignoreadvice)
+				break;
 			qlock(s);
 			qunlock(udp);
 			qhangup(s->rq, msg);
diff --git a/port/devsdp.c b/port/devsdp.c
index df4c84f309afdccbc35dd46b1daece93850636a8..2de711ec437dfa2bb41c7065898361444a62af86 100644
--- a/port/devsdp.c
+++ b/port/devsdp.c
@@ -42,7 +42,7 @@ enum
 	Maxconv= 256,		// power of 2
 	Nfs= 4,			// number of file systems
 	MaxRetries=	12,
-	KeepAlive = 60,		// keep alive in seconds
+	KeepAlive = 300,	// keep alive in seconds - should probably be about 60 but is higher to avoid linksys bug
 	SecretLength= 32,	// a secret per direction
 	SeqMax = (1<<24),
 	SeqWindow = 32,