svn commit: r190200 - in stable/7/sys: . contrib/pf dev/cxgb netinet netinet6

[Bjoern A. Zeeb]

Author: bz
Date: Sat Mar 21 13:37:49 2009
New Revision: 190200
URL: http://svn.freebsd.org/changeset/base/190200

Log:
  MFC r186223:
  
    Another step assimilating IPv[46] PCB code:
    normalize IN6P_* compat flags usage to their equialent
    INP_* counterpart.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/netinet/in_pcb.h
  stable/7/sys/netinet6/icmp6.c
  stable/7/sys/netinet6/ip6_output.c
  stable/7/sys/netinet6/raw_ip6.c
  stable/7/sys/netinet6/udp6_usrreq.c

Modified: stable/7/sys/netinet/in_pcb.h
==============================================================================
--- stable/7/sys/netinet/in_pcb.h	Sat Mar 21 12:53:42 2009	(r190199)
+++ stable/7/sys/netinet/in_pcb.h	Sat Mar 21 13:37:49 2009	(r190200)
@@ -466,7 +466,7 @@ void 	inp_4tuple_get(struct inpcb *inp, 
 #define	IN6P_RECVIF		INP_RECVIF
 #define	IN6P_MTUDISC		INP_MTUDISC
 #define	IN6P_FAITH		INP_FAITH
-#define	IN6P_CONTROLOPTS INP_CONTROLOPTS
+#define	IN6P_CONTROLOPTS	INP_CONTROLOPTS
 	/*
 	 * socket AF version is {newer than,or include}
 	 * actual datagram AF version

Modified: stable/7/sys/netinet6/icmp6.c
==============================================================================
--- stable/7/sys/netinet6/icmp6.c	Sat Mar 21 12:53:42 2009	(r190199)
+++ stable/7/sys/netinet6/icmp6.c	Sat Mar 21 13:37:49 2009	(r190200)
@@ -1952,7 +1952,7 @@ icmp6_rip6_input(struct mbuf **mp, int o
 			}
 			if (n != NULL ||
 			    (n = m_copy(m, 0, (int)M_COPYALL)) != NULL) {
-				if (last->inp_flags & IN6P_CONTROLOPTS)
+				if (last->inp_flags & INP_CONTROLOPTS)
 					ip6_savecontrol(last, n, &opts);
 				/* strip intermediate headers */
 				m_adj(n, off);
@@ -1978,7 +1978,7 @@ icmp6_rip6_input(struct mbuf **mp, int o
 	}
 	INP_INFO_RUNLOCK(&ripcbinfo);
 	if (last) {
-		if (last->inp_flags & IN6P_CONTROLOPTS)
+		if (last->inp_flags & INP_CONTROLOPTS)
 			ip6_savecontrol(last, m, &opts);
 		/* strip intermediate headers */
 		m_adj(m, off);

Modified: stable/7/sys/netinet6/ip6_output.c
==============================================================================
--- stable/7/sys/netinet6/ip6_output.c	Sat Mar 21 12:53:42 2009	(r190199)
+++ stable/7/sys/netinet6/ip6_output.c	Sat Mar 21 13:37:49 2009	(r190200)
@@ -1552,7 +1552,7 @@ do { \
 					break;
 
 				case IPV6_FAITH:
-					OPTSET(IN6P_FAITH);
+					OPTSET(INP_FAITH);
 					break;
 
 				case IPV6_RECVPATHMTU:
@@ -1762,18 +1762,18 @@ do { \
 
 				switch (optval) {
 				case IPV6_PORTRANGE_DEFAULT:
-					in6p->inp_flags &= ~(IN6P_LOWPORT);
-					in6p->inp_flags &= ~(IN6P_HIGHPORT);
+					in6p->inp_flags &= ~(INP_LOWPORT);
+					in6p->inp_flags &= ~(INP_HIGHPORT);
 					break;
 
 				case IPV6_PORTRANGE_HIGH:
-					in6p->inp_flags &= ~(IN6P_LOWPORT);
-					in6p->inp_flags |= IN6P_HIGHPORT;
+					in6p->inp_flags &= ~(INP_LOWPORT);
+					in6p->inp_flags |= INP_HIGHPORT;
 					break;
 
 				case IPV6_PORTRANGE_LOW:
-					in6p->inp_flags &= ~(IN6P_HIGHPORT);
-					in6p->inp_flags |= IN6P_LOWPORT;
+					in6p->inp_flags &= ~(INP_HIGHPORT);
+					in6p->inp_flags |= INP_LOWPORT;
 					break;
 
 				default:
@@ -1875,7 +1875,7 @@ do { \
 					break;
 
 				case IPV6_FAITH:
-					optval = OPTBIT(IN6P_FAITH);
+					optval = OPTBIT(INP_FAITH);
 					break;
 
 				case IPV6_V6ONLY:
@@ -1886,9 +1886,9 @@ do { \
 				    {
 					int flags;
 					flags = in6p->inp_flags;
-					if (flags & IN6P_HIGHPORT)
+					if (flags & INP_HIGHPORT)
 						optval = IPV6_PORTRANGE_HIGH;
-					else if (flags & IN6P_LOWPORT)
+					else if (flags & INP_LOWPORT)
 						optval = IPV6_PORTRANGE_LOW;
 					else
 						optval = 0;

Modified: stable/7/sys/netinet6/raw_ip6.c
==============================================================================
--- stable/7/sys/netinet6/raw_ip6.c	Sat Mar 21 12:53:42 2009	(r190199)
+++ stable/7/sys/netinet6/raw_ip6.c	Sat Mar 21 13:37:49 2009	(r190200)
@@ -193,7 +193,7 @@ rip6_input(struct mbuf **mp, int *offp, 
 			} else
 #endif /* IPSEC */
 			if (n) {
-				if (last->inp_flags & IN6P_CONTROLOPTS ||
+				if (last->inp_flags & INP_CONTROLOPTS ||
 				    last->inp_socket->so_options & SO_TIMESTAMP)
 					ip6_savecontrol(last, n, &opts);
 				/* strip intermediate headers */
@@ -227,7 +227,7 @@ rip6_input(struct mbuf **mp, int *offp, 
 	} else
 #endif /* IPSEC */
 	if (last) {
-		if (last->inp_flags & IN6P_CONTROLOPTS ||
+		if (last->inp_flags & INP_CONTROLOPTS ||
 		    last->inp_socket->so_options & SO_TIMESTAMP)
 			ip6_savecontrol(last, m, &opts);
 		/* Strip intermediate headers. */

Modified: stable/7/sys/netinet6/udp6_usrreq.c
==============================================================================
--- stable/7/sys/netinet6/udp6_usrreq.c	Sat Mar 21 12:53:42 2009	(r190199)
+++ stable/7/sys/netinet6/udp6_usrreq.c	Sat Mar 21 13:37:49 2009	(r190200)
@@ -147,7 +147,7 @@ udp6_append(struct inpcb *inp, struct mb
 	}
 #endif
 	opts = NULL;
-	if (inp->inp_flags & IN6P_CONTROLOPTS ||
+	if (inp->inp_flags & INP_CONTROLOPTS ||
 	    inp->inp_socket->so_options & SO_TIMESTAMP)
 		ip6_savecontrol(inp, n, &opts);
 	m_adj(n, off + sizeof(struct udphdr));