diff options
| -rw-r--r-- | sys/src/9/ip/ip.h | 4 | ||||
| -rw-r--r-- | sys/src/9/ip/ipifc.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/src/9/ip/ip.h b/sys/src/9/ip/ip.h index 919dd7de6..676c09fc4 100644 --- a/sys/src/9/ip/ip.h +++ b/sys/src/9/ip/ip.h @@ -274,9 +274,9 @@ struct Iplink Ipself *self; Iplifc *lifc; Iplink *selflink; /* next link for this local address */ - Iplink *lifclink; /* next link for this ifc */ - ulong expire; + Iplink *lifclink; /* next link for this lifc */ Iplink *next; /* free list */ + ulong expire; int ref; }; diff --git a/sys/src/9/ip/ipifc.c b/sys/src/9/ip/ipifc.c index 645e4f1e7..45187583b 100644 --- a/sys/src/9/ip/ipifc.c +++ b/sys/src/9/ip/ipifc.c @@ -26,12 +26,10 @@ Medium *media[Maxmedia] = { 0 }; struct Ipself { uchar a[IPaddrlen]; - Ipself *hnext; /* next address in the hash table */ + Ipself *next; /* next address in the hash table */ Iplink *link; /* binding twixt Ipself and Ipifc */ ulong expire; uchar type; /* type of address */ - int ref; - Ipself *next; /* free list */ }; struct Ipselftab @@ -1100,7 +1098,6 @@ ipselftabread(Fs *f, char *cp, ulong offset, int n) m = 0; off = offset; - qlock(f->self); for(i = 0; i < NHASH && m < n; i++){ for(p = f->self->hash[i]; p != nil && m < n; p = p->next){ nifc = 0; @@ -1115,7 +1112,6 @@ ipselftabread(Fs *f, char *cp, ulong offset, int n) } } } - qunlock(f->self); return m; } |