diff options
author | rwatson <rwatson@FreeBSD.org> | 2005-01-03 12:54:31 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2005-01-03 12:54:31 +0000 |
commit | 6ea7cec670073503257352c3158d36f47bcf0feb (patch) | |
tree | f77d41b2757eb83cc13a5bbba40e9a0c0d638535 | |
parent | 25d6a6cbc3ce924f032581776f8a9ceaf9426bff (diff) | |
download | FreeBSD-src-6ea7cec670073503257352c3158d36f47bcf0feb.zip FreeBSD-src-6ea7cec670073503257352c3158d36f47bcf0feb.tar.gz |
Garbage collect unused ipx_abort().
Spell NULL right in a KASSERT() panic message.
MFC after: 1 week
-rw-r--r-- | sys/netipx/ipx_usrreq.c | 14 | ||||
-rw-r--r-- | sys/netipx/ipx_var.h | 1 |
2 files changed, 2 insertions, 13 deletions
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c index 88f36c4..5e5e4f4 100644 --- a/sys/netipx/ipx_usrreq.c +++ b/sys/netipx/ipx_usrreq.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004 Robert N. M. Watson + * Copyright (c) 2004-2005 Robert N. M. Watson * Copyright (c) 1995, Mike Mitchell * Copyright (c) 1984, 1985, 1986, 1987, 1993 * The Regents of the University of California. All rights reserved. @@ -128,7 +128,7 @@ ipx_input(m, ipxp) struct ifnet *ifp = m->m_pkthdr.rcvif; struct sockaddr_ipx ipx_ipx; - KASSERT(ipxp != NULL, ("ipx_input: NUL ipxpcb")); + KASSERT(ipxp != NULL, ("ipx_input: NULL ipxpcb")); /* * Construct sockaddr format source address. * Stuff source address and datagram in user buffer. @@ -163,16 +163,6 @@ ipx_input(m, ipxp) sorwakeup(ipxp->ipxp_socket); } -void -ipx_abort(ipxp) - struct ipxpcb *ipxp; -{ - struct socket *so = ipxp->ipxp_socket; - - ipx_pcbdisconnect(ipxp); - soisdisconnected(so); -} - /* * Drop connection, reporting * the specified error. diff --git a/sys/netipx/ipx_var.h b/sys/netipx/ipx_var.h index 74fc0ff..33985d3 100644 --- a/sys/netipx/ipx_var.h +++ b/sys/netipx/ipx_var.h @@ -86,7 +86,6 @@ struct sockaddr; struct socket; struct sockopt; -void ipx_abort(struct ipxpcb *ipxp); u_short ipx_cksum(struct mbuf *m, int len); int ipx_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td); |