- Revert 44301

svn path=/branches/aicom-network-branch/; revision=44354

diff --cc drivers/network/tcpip/datalink/lan.c
Simple merge

diff --cc drivers/network/tcpip/include/address.h
Simple merge

diff --cc drivers/network/tcpip/include/datagram.h
Simple merge

diff --cc drivers/network/tcpip/include/debug.h
Simple merge

diff --cc drivers/network/tcpip/include/dispatch.h
Simple merge

diff --cc drivers/network/tcpip/include/fileobjs.h
Simple merge

diff --cc drivers/network/tcpip/include/ip.h
Simple merge

diff --cc drivers/network/tcpip/include/lock.h
Simple merge

diff --cc drivers/network/tcpip/include/neighbor.h
Simple merge

diff --cc drivers/network/tcpip/include/precomp.h
Simple merge

diff --cc drivers/network/tcpip/include/routines.h
Simple merge

diff --cc drivers/network/tcpip/include/tags.h
index 0000000,52c16a4..52c16a4
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/network/tcpip/include/tags.h
+++ b/drivers/network/tcpip/include/tags.h

diff --cc drivers/network/tcpip/include/tcp.h
Simple merge

diff --cc drivers/network/tcpip/include/titypes.h
Simple merge

diff --cc drivers/network/tcpip/tcpip.rbuild
Simple merge

diff --cc drivers/network/tcpip/tcpip/ainfo.c
Simple merge

diff --cc drivers/network/tcpip/tcpip/buffer.c
Simple merge

diff --cc drivers/network/tcpip/tcpip/dispatch.c
Simple merge

diff --cc drivers/network/tcpip/tcpip/fileobjs.c
Simple merge

diff --cc drivers/network/tcpip/tcpip/iinfo.c
Simple merge

diff --cc drivers/network/tcpip/tcpip/lock.c
Simple merge

diff --cc drivers/network/tcpip/tcpip/main.c
Simple merge

diff --cc drivers/network/tcpip/tcpip/mocklock.c
Simple merge

diff --cc drivers/network/tcpip/tcpip/ninfo.c
Simple merge

diff --cc lib/drivers/ip/ip.rbuild
Simple merge

diff --cc lib/drivers/ip/network/address.c
Simple merge

diff --cc lib/drivers/ip/network/ip.c
Simple merge

diff --cc lib/drivers/ip/network/neighbor.c
Simple merge

diff --cc lib/drivers/ip/network/ports.c
Simple merge

diff --cc lib/drivers/ip/network/receive.c
Simple merge

diff --cc lib/drivers/ip/network/router.c
Simple merge

diff --cc lib/drivers/ip/network/routines.c
Simple merge

diff --cc lib/drivers/ip/network/transmit.c
Simple merge

diff --cc lib/drivers/ip/transport/datagram/datagram.c
Simple merge

diff --cc lib/drivers/ip/transport/rawip/rawip.c
Simple merge

diff --cc lib/drivers/ip/transport/tcp/accept.c
Simple merge

diff --cc lib/drivers/ip/transport/tcp/event.c
Simple merge

diff --cc lib/drivers/ip/transport/tcp/if.c
Simple merge

diff --cc lib/drivers/ip/transport/tcp/tcp.c
Simple merge

diff --cc lib/drivers/ip/transport/udp/udp.c
Simple merge

diff --cc lib/drivers/oskittcp/include/oskittcp.h
Simple merge

diff --cc lib/drivers/oskittcp/oskittcp/interface.c
Simple merge