diff options
author | Robert Watson <rwatson@FreeBSD.org> | 2004-02-28 15:12:20 +0000 |
---|---|---|
committer | Robert Watson <rwatson@FreeBSD.org> | 2004-02-28 15:12:20 +0000 |
commit | a7b6a14aeec5b4d117a37b5f6494376f20bd9869 (patch) | |
tree | 1f30403824ca1674b849de18ef178e22e57c3eb3 /sys/netinet/tcp_subr.c | |
parent | c2a4d8794a3b42c6729716ffc9bbe72a9e0787f5 (diff) | |
download | src-a7b6a14aeec5b4d117a37b5f6494376f20bd9869.tar.gz src-a7b6a14aeec5b4d117a37b5f6494376f20bd9869.zip |
Remove now unneeded arguments to tcp_twrespond() -- so and msrc. These
were needed by the MAC Framework until inpcbs gained labels.
Submitted by: sam
Notes
Notes:
svn path=/head/; revision=126351
Diffstat (limited to 'sys/netinet/tcp_subr.c')
-rw-r--r-- | sys/netinet/tcp_subr.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 10d0cd6cbf3c..94a21133acc2 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); |