Remove now unneeded arguments to tcp_twrespond() -- so and msrc. These

were needed by the MAC Framework until inpcbs gained labels.

Submitted by:	sam

5 files changed, 7 insertions, 23 deletions

diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 1fe6ef4..d020374 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -3177,7 +3177,7 @@ tcp_timewait(tw, to, th, m, tlen)
 	 */
 	if (thflags != TH_ACK || tlen != 0 || 
 	    th->th_seq != tw->rcv_nxt || th->th_ack != tw->snd_nxt)
-		tcp_twrespond(tw, NULL, m, TH_ACK);
+		tcp_twrespond(tw, TH_ACK);
 	goto drop;
 
 reset:
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 1fe6ef4..d020374 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -3177,7 +3177,7 @@ tcp_timewait(tw, to, th, m, tlen)
 	 */
 	if (thflags != TH_ACK || tlen != 0 || 
 	    th->th_seq != tw->rcv_nxt || th->th_ack != tw->snd_nxt)
-		tcp_twrespond(tw, NULL, m, TH_ACK);
+		tcp_twrespond(tw, TH_ACK);
 	goto drop;
 
 reset:
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 10d0cd6..94a2113 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1608,7 +1608,7 @@ tcp_twstart(tp)
 	tw->tw_cred = crhold(so->so_cred);
 	tw->tw_so_options = so->so_options;
 	if (acknow)
-		tcp_twrespond(tw, so, NULL, TH_ACK);
+		tcp_twrespond(tw, TH_ACK);
 	sotryfree(so);
 	inp->inp_socket = NULL;
 	inp->inp_ppcb = (caddr_t)tw;
@@ -1671,13 +1671,8 @@ tcp_twclose(struct tcptw *tw, int reuse)
 	return (NULL);
 }
 
-/*
- * One of so and msrc must be non-NULL for use by the MAC Framework to
- * construct a label for ay resulting packet.
- */
 int
-tcp_twrespond(struct tcptw *tw, struct socket *so, struct mbuf *msrc,
-    int flags)
+tcp_twrespond(struct tcptw *tw, int flags)
 {
 	struct inpcb *inp = tw->tw_inpcb;
 	struct tcphdr *th;
@@ -1691,9 +1686,6 @@ tcp_twrespond(struct tcptw *tw, struct socket *so, struct mbuf *msrc,
 	int isipv6 = inp->inp_inc.inc_isipv6;
 #endif
 
-	KASSERT(so != NULL || msrc != NULL,
-	    ("tcp_twrespond: so and msrc NULL"));
-
 	m = m_gethdr(M_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		return (ENOBUFS);
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 10d0cd6..94a2113 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -1608,7 +1608,7 @@ tcp_twstart(tp)
 	tw->tw_cred = crhold(so->so_cred);
 	tw->tw_so_options = so->so_options;
 	if (acknow)
-		tcp_twrespond(tw, so, NULL, TH_ACK);
+		tcp_twrespond(tw, TH_ACK);
 	sotryfree(so);
 	inp->inp_socket = NULL;
 	inp->inp_ppcb = (caddr_t)tw;
@@ -1671,13 +1671,8 @@ tcp_twclose(struct tcptw *tw, int reuse)
 	return (NULL);
 }
 
-/*
- * One of so and msrc must be non-NULL for use by the MAC Framework to
- * construct a label for ay resulting packet.
- */
 int
-tcp_twrespond(struct tcptw *tw, struct socket *so, struct mbuf *msrc,
-    int flags)
+tcp_twrespond(struct tcptw *tw, int flags)
 {
 	struct inpcb *inp = tw->tw_inpcb;
 	struct tcphdr *th;
@@ -1691,9 +1686,6 @@ tcp_twrespond(struct tcptw *tw, struct socket *so, struct mbuf *msrc,
 	int isipv6 = inp->inp_inc.inc_isipv6;
 #endif
 
-	KASSERT(so != NULL || msrc != NULL,
-	    ("tcp_twrespond: so and msrc NULL"));
-
 	m = m_gethdr(M_DONTWAIT, MT_HEADER);
 	if (m == NULL)
 		return (ENOBUFS);
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 8fbce8d..221f48f8 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -539,7 +539,7 @@ struct inpcb *
 	 tcp_quench(struct inpcb *, int);
 void	 tcp_respond(struct tcpcb *, void *,
 	    struct tcphdr *, struct mbuf *, tcp_seq, tcp_seq, int);
-int	 tcp_twrespond(struct tcptw *, struct socket *, struct mbuf *, int);
+int	 tcp_twrespond(struct tcptw *, int);
 void	 tcp_setpersist(struct tcpcb *);
 #ifdef TCP_SIGNATURE
 int	 tcp_signature_compute(struct mbuf *, int, int, int, u_char *, u_int);