From 3a41d9f73292ab5cb0545a1ac34a494d5e6ce5f4 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Sat, 31 May 1997 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1997-05-31

---
 ip/devip.c  | 3 ++-
 ip/gre.c    | 6 +++---
 pc/devvga.c | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ip/devip.c b/ip/devip.c
index 63f3384250d7f31f8b94daaaa6f611989a7d697b..54fe3ceba81626daaefe44b7ea8c575080e6bf81 100644
--- a/ip/devip.c
+++ b/ip/devip.c
@@ -408,7 +408,8 @@ ipclose(Chan* c)
 	default:
 		break;
 	case Qipifc:
-		closeifcconv(c->aux);
+		if(c->flag & COPEN)
+			closeifcconv(c->aux);
 		c->aux = nil;
 		break;
 	case Qlog:
diff --git a/ip/gre.c b/ip/gre.c
index 1cde43cc415ca76d91916bc318bf518843edecc5..4542c8a7c6360f8c0ce09ca43c919aefade81cc5 100644
--- a/ip/gre.c
+++ b/ip/gre.c
@@ -142,11 +142,11 @@ grekick(Conv *c, int l)
 
 	ghp = (GREhdr *)(bp->rp);
 
-	raddr = nhgetl(ghp->src);
-	laddr = nhgetl(ghp->dst);
+	raddr = nhgetl(ghp->dst);
+	laddr = nhgetl(ghp->src);
 	if(raddr == 0)
 		raddr = c->raddr;
-	if(laddr == 0 || Mediaforme(ghp->dst) <= 0)
+	if(laddr == 0 || Mediaforme(ghp->src) <= 0)
 		laddr = c->laddr;
 
 	ghp->proto = IP_GREPROTO;
diff --git a/pc/devvga.c b/pc/devvga.c
index b914e3e008e901df26d8d0c61579e1f0a6bf64f1..bd383baa6f60c2c23f802fbfcdc64695d1b7fbc1 100644
--- a/pc/devvga.c
+++ b/pc/devvga.c
@@ -331,7 +331,7 @@ vgactl(char *arg)
 		}
 
 		/* grab new space */
-		if(align == 0){
+		if(align == 0 || (screenmem % (align-1)) == 0){
 			if(footprint >= size)
 				return;
 		} else {