2 files changed, 6 insertions(+), 5 deletions(-)

M ip/ip.c
M pc/vgaclgd542x.c

@@ 100,21 100,21 @@ ipoput(Block *bp, int gating, int ttl)
 		chunk = nhgets(eh->length);
 		if(chunk > len){
 			netlog(Logip, "short gated packet\n");
-			goto raise;
+			goto free;
 		}
 		if(chunk < len)
 			len = chunk;
 	}
 	if(len >= IP_MAX){
 		netlog(Logip, "exceeded ip max size %V\n", eh->dst);
-		goto raise;
+		goto free;
 	}
 
 	r = v4lookup(eh->dst);
 	if(r == nil){
 		stats.noroute++;
 		netlog(Logip, "no interface %V\n", eh->dst);
-		goto raise;
+		goto free;
 	}
 	if(r->type & (Rifc|Runi|Rbcast|Rmulti))
 		gate = eh->dst;


@@ 224,6 224,7 @@ ipoput(Block *bp, int gating, int ttl)
 raise:
 	runlock(ifc);
 	poperror();
+free:
 	freeblist(bp);	
 }
 

@@ 58,8 58,8 @@ clgd542xenable(VGAscr* scr)
 	/*
 	 * Disable the cursor.
 	 */
-	sr12 = vgaxi(Seqx, 0x12);
-	vgaxo(Seqx, 0x12, sr12 & ~0x01);
+	sr12 = vgaxi(Seqx, 0x12) & ~0x01;
+	vgaxo(Seqx, 0x12, sr12);
 
 	/*
 	 * Cursor colours.