Plan 9 kernel fixes by Yoann Padioleau. http://9fans.net/archive/2014/06/16 http://9fans.net/archive/2014/06/198 http://9fans.net/archive/2014/06/32 http://9fans.net/archive/2014/06/33 [9fans] bug in network stack regarding Ipht (2015-06-09) sdiff /sys/src/9/port/devcons.c /sys/src/9/port/taslock.c /sys/src/9/pc/main.c | night --- /n/sources/plan9/sys/src/9/port/devcons.c Fri Jul 19 06:22:41 2013 +++ /sys/src/9/port/devcons.c Wed Jun 18 00:00:00 2014 @@ -523,7 +523,7 @@ kbdputc(Queue*, int ch) { int i, n; - char buf[3]; + char buf[UTFmax]; Rune r; char *next; --- /n/sources/plan9/sys/src/9/port/taslock.c Mon Apr 8 18:18:51 2013 +++ /sys/src/9/port/taslock.c Wed Jun 18 00:00:00 2014 @@ -80,6 +80,7 @@ l->pc = pc; l->p = up; l->isilock = 0; + l->m = MACHP(m->machno); #ifdef LOCKCYCLES l->lockcycles = -lcycles(); #endif --- /n/sources/plan9/sys/src/9/pc/main.c Tue Mar 11 19:49:31 2014 +++ /sys/src/9/pc/main.c Wed Jun 18 00:00:00 2014 @@ -489,7 +489,7 @@ + conf.nproc*sizeof(Proc) + conf.nimage*sizeof(Image) + conf.nswap - + conf.nswppo*sizeof(Page); + + conf.nswppo*sizeof(Page*); mainmem->maxsize = kpages; if(!cpuserver){ /* --- /n/sources/plan9/sys/src/9/ip/ip.h Tue Mar 18 21:32:41 2014 +++ /sys/src/9/ip/ip.h Tue Jun 9 00:00:00 2015 @@ -37,7 +37,6 @@ { Addrlen= 64, Maxproto= 20, - Nhash= 64, Maxincall= 64, /* max. conn.s in listen q not accepted yet */ Nchans= 1024, MAClen= 16, /* longest mac address */ --- /n/sources/plan9/sys/src/9/ip/ipaux.c Thu Feb 28 20:38:48 2008 +++ /sys/src/9/ip/ipaux.c Tue Jun 9 00:00:00 2015 @@ -238,7 +238,7 @@ ulong iphash(uchar *sa, ushort sp, uchar *da, ushort dp) { - return ((sa[IPaddrlen-1]<<24) ^ (sp << 16) ^ (da[IPaddrlen-1]<<8) ^ dp ) % Nhash; + return ((sa[IPaddrlen-1]<<24) ^ (sp << 16) ^ (da[IPaddrlen-1]<<8) ^ dp ) % Nipht; } void