- merge revision 1.16
authorMark Huang <mlhuang@cs.princeton.edu>
Fri, 4 Mar 2005 13:59:08 +0000 (13:59 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Fri, 4 Mar 2005 13:59:08 +0000 (13:59 +0000)
commitfa00f0d3f0999e09217eb4d8dd4b222e7f1f8b6b
treefd944d96436e7ca2b34ab51d1eac02dc322a8476
parent7a860b5c1628f14ce9120723ec99d1257f90c7d2
- merge revision 1.16
date: 2005/02/01 03:16:01;  author: mlhuang;  state: Exp;  lines: +9 -9
- bound vnet mods by #ifdef
- bound runtime vnet code by if (vnet_active)
net/ipv4/tcp_ipv4.c