PERFORCE change 146588 for review

[Julian Elischer]

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

Change 146588 by julian at julian_trafmon1 on 2008/08/04 04:14:19

	Keep the vimage side of thing s compiling too.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#28 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_output.c#18 edit
.. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#31 edit
.. //depot/projects/vimage/src/sys/netinet6/icmp6.c#25 edit
.. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#20 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#28 (text+ko) ====

@@ -973,13 +973,13 @@
 		switch (iptos & IPTOS_ECN_MASK) {
 		case IPTOS_ECN_CE:
 			tp->t_flags |= TF_ECN_SND_ECE;
-			tcpstat.tcps_ecn_ce++;
+			V_tcpstat.tcps_ecn_ce++;
 			break;
 		case IPTOS_ECN_ECT0:
-			tcpstat.tcps_ecn_ect0++;
+			V_tcpstat.tcps_ecn_ect0++;
 			break;
 		case IPTOS_ECN_ECT1:
-			tcpstat.tcps_ecn_ect1++;
+			V_tcpstat.tcps_ecn_ect1++;
 			break;
 		}
 
@@ -992,7 +992,7 @@
 		 */
 		if ((thflags & TH_ECE) &&
 		    SEQ_LEQ(th->th_ack, tp->snd_recover)) {
-			tcpstat.tcps_ecn_rcwnd++;
+			V_tcpstat.tcps_ecn_rcwnd++;
 			tcp_congestion_exp(tp);
 		}
 	}
@@ -1391,7 +1391,7 @@
 
 			if ((thflags & TH_ECE) && V_tcp_do_ecn) {
 				tp->t_flags |= TF_ECN_PERMIT;
-				tcpstat.tcps_ecn_shs++;
+				V_tcpstat.tcps_ecn_shs++;
 			}
 			
 			/*

==== //depot/projects/vimage/src/sys/netinet/tcp_output.c#18 (text+ko) ====

@@ -918,7 +918,7 @@
 			else
 #endif
 				ip->ip_tos |= IPTOS_ECN_ECT0;
-			tcpstat.tcps_ecn_ect0++;
+			V_tcpstat.tcps_ecn_ect0++;
 		}
 		
 		/*

==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#31 (text+ko) ====

@@ -1217,7 +1217,7 @@
 		sc->sc_peer_mss = to->to_mss;	/* peer mss may be zero */
 	if (noopt)
 		sc->sc_flags |= SCF_NOOPT;
-	if ((th->th_flags & (TH_ECE|TH_CWR)) && tcp_do_ecn)
+	if ((th->th_flags & (TH_ECE|TH_CWR)) && V_tcp_do_ecn)
 		sc->sc_flags |= SCF_ECN;
 
 	if (tcp_syncookies) {
@@ -1360,7 +1360,7 @@
 
 	if (sc->sc_flags & SCF_ECN) {
 		th->th_flags |= TH_ECE;
-		tcpstat.tcps_ecn_shs++;
+		V_tcpstat.tcps_ecn_shs++;
 	}
 
 	/* Tack on the TCP options. */

==== //depot/projects/vimage/src/sys/netinet6/icmp6.c#25 (text+ko) ====

@@ -115,9 +115,9 @@
 
 struct icmp6stat icmp6stat;
 
+#ifndef VIMAGE
 extern struct inpcbinfo ripcbinfo;
 extern struct inpcbhead ripcb;
-#ifndef VIMAGE
 extern int icmp6errppslim;
 static int icmp6errpps_count;
 #endif /* !VIMAGE */
@@ -2000,7 +2000,7 @@
 		}
 		last = in6p;
 	}
-	INP_INFO_RUNLOCK(&ripcbinfo);
+	INP_INFO_RUNLOCK(&V_ripcbinfo);
 	if (last) {
 		if (last->in6p_flags & IN6P_CONTROLOPTS)
 			ip6_savecontrol(last, m, &opts);

==== //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#20 (text+ko) ====

@@ -222,7 +222,7 @@
 		}
 		last = in6p;
 	}
-	INP_INFO_RUNLOCK(&ripcbinfo);
+	INP_INFO_RUNLOCK(&V_ripcbinfo);
 #ifdef IPSEC
 	/*
 	 * Check AH/ESP integrity.
@@ -771,7 +771,6 @@
 rip6_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam,
     struct mbuf *control, struct thread *td)
 {
-	INIT_VNET_INET(so->so_vnet);
 	struct inpcb *inp;
 	struct sockaddr_in6 tmp;
 	struct sockaddr_in6 *dst;