- merge revision 1.14
authorMark Huang <mlhuang@cs.princeton.edu>
Tue, 30 Nov 2004 16:46:21 +0000 (16:46 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Tue, 30 Nov 2004 16:46:21 +0000 (16:46 +0000)
commit69d41aee2b1ba76c39af1f2edc83e1e667bed209
tree64bf80c865bda78eabdb7add5082015220ff7c5c
parent3e96cfe11b4c1855791eaf7a925c38fbf7887051
- merge revision 1.14
date: 2004/11/30 16:32:22;  author: mlhuang;  state: Exp;  lines: +1 -2
- return -EPERM instead of silently freeing
----------------------------
- merge revision 1.13
date: 2004/11/30 15:59:12;  author: mef;  state: Exp;  lines: +4 -1
PL3069

Fixed memory leak of skbuff.  Requires changes to accurately do statistics
and some additional cosmetic changes.  But this should be sufficient for
the next release candidate.
include/net/sock.h