- finish updating cec, aoe for new net interface - change some configurations, and use ticket locks for ivey - fix pc idle definition Reference: /n/atom/patch/applied/fsbits Date: Mon Apr 14 15:34:59 CES 2014 Signed-off-by: quanstro@quanstro.net --- /sys/src/fs/port/devcec.c Mon Apr 14 15:34:37 2014 +++ /sys/src/fs/port/devcec.c Mon Apr 14 15:34:38 2014 @@ -525,19 +525,22 @@ } void -cecreceive(Enpkt *ep, int, Ifc *i) +cecreceive(Ifc *i, Msgbuf *mb) { If *if0; Pkt *p; Conn *c; - - p = (Pkt*)ep; + + p = (Pkt*)mb->data; pkttrace(p); - if((if0 = findif(i)) == nil) + if((if0 = findif(i)) == nil){ + mbfree(mb); return; + } c = findconn(p->src, p->conn); if(c == nil){ cecprint("cec: out of connection structures\n"); + mbfree(mb); return; } qlock(c); @@ -591,6 +594,7 @@ break; } qunlock(c); + mbfree(mb); } static char *cstate[] = { "unused", "initb", "login", "open" }; --- /sys/src/fs/ivey/mkfile Mon Apr 14 15:34:39 2014 +++ /sys/src/fs/ivey/mkfile Mon Apr 14 15:34:40 2014 @@ -72,8 +72,8 @@ iasata.$O\ ioapic.$O\ lapic.$O\ - lock.$O\ -# tiklock.$O\ +# lock.$O\ + tiklock.$O\ malloc.$O\ mmu.$O\ # mp.$O\ --- /sys/src/fs/fairyland/etherctlr.c Mon Apr 14 15:34:41 2014 +++ /sys/src/fs/fairyland/etherctlr.c Mon Apr 14 15:34:42 2014 @@ -29,7 +29,7 @@ // { "igbe", igbepnp, }, // { "i82543", igbepnp, }, // { "rtl8139", rtl8139pnp, }, -// { "rtl8169", rtl8169pnp, }, + { "rtl8169", rtl8169pnp, }, { "i82563", i82563reset }, // { "m10g", m10gpnp }, { "i82598", i82598pnp }, --- /sys/src/fs/dev/aoe.h Mon Apr 14 15:34:44 2014 +++ /sys/src/fs/dev/aoe.h Mon Apr 14 15:34:44 2014 @@ -61,4 +61,4 @@ uchar cslen[2]; }Aoeqc; -void aoereceive(Enpkt*, int, Ifc*); +void aoereceive(Ifc*, Msgbuf*); --- /sys/src/fs/pc/etherm10g.c Mon Apr 14 15:34:47 2014 +++ /sys/src/fs/pc/etherm10g.c Mon Apr 14 15:34:48 2014 @@ -1531,7 +1531,7 @@ e->transmit = m10gtransmit; e->interrupt = m10ginterrupt; if(cmd++ == 0) - cmd_install("myrictl", "tweak myri parameters", m10gctl); + cmd_install("myrictl", "-­ tweak myricom parameters", m10gctl); return 0; } --- /sys/src/fs/pc/l.s Mon Apr 14 15:34:49 2014 +++ /sys/src/fs/pc/l.s Mon Apr 14 15:34:50 2014 @@ -649,7 +649,7 @@ /* * do nothing whatsoever till interrupt happens */ -TEXT idlehands(SB),$0 +TEXT idle(SB),$0 HLT RET