PERFORCE change 153774 for review

[Marko Zec]

http://perforce.freebsd.org/chv.cgi?CH=153774

Change 153774 by zec at zec_tpx32 on 2008/11/29 18:16:13

	Merge fixes from vimage branch.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#15 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#32 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#27 edit
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#18 edit

Differences ...

==== //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#15 (text+ko) ====

@@ -791,7 +791,6 @@
 void
 in_delayed_cksum(struct mbuf *m)
 {
-	INIT_VNET_INET(curvnet);
 	struct ip *ip;
 	u_short csum, offset;
 

==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#32 (text+ko) ====

@@ -201,7 +201,7 @@
     "Enable tcp_drain routine for extra help when low on mbufs");
 
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, pcbcount,
-    CTLFLAG_RD, V_tcbinfo.ipi_count, 0, "Number of active PCBs");
+    CTLFLAG_RD, tcbinfo.ipi_count, 0, "Number of active PCBs");
 
 SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, icmp_may_rst,
     CTLFLAG_RW, icmp_may_rst, 0,

==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#27 (text+ko) ====

@@ -1197,7 +1197,7 @@
 	sin = (struct sockaddr_in *)nam;
 	if (prison_remote_ip4(td->td_ucred, &sin->sin_addr) != 0) {
 		INP_WUNLOCK(inp);
-		INP_INFO_WUNLOCK(&udbinfo);
+		INP_INFO_WUNLOCK(&V_udbinfo);
 		return (EAFNOSUPPORT);
 	}
 	error = in_pcbconnect(inp, nam, td->td_ucred);

==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#18 (text+ko) ====

@@ -332,16 +332,6 @@
 #define	V_udpstat		VNET_INET(udpstat)
 #define	V_useloopback		VNET_INET(useloopback)
 
-static __inline uint16_t ip_newid(void);
-extern int ip_do_randomid;
-
-static __inline uint16_t
-ip_newid(void)
-{
-        if (V_ip_do_randomid)
-                return ip_randomid();
-
-        return htons(V_ip_id++);
-}
+#define ip_newid() (V_ip_do_randomid != 0 ? ip_randomid() : htons(V_ip_id++))
 
 #endif /* !_NETINET_VINET_H_ */