summaryrefslogtreecommitdiffstats
path: root/sys/netipx/spx_usrreq.c
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2006-03-27 00:08:32 +0000
committerrwatson <rwatson@FreeBSD.org>2006-03-27 00:08:32 +0000
commiteaec7254b67e5191f375fd6c56b4d2931a3bd189 (patch)
treef9032b9d9d8615a961c310055ef9c8f9d3791fd0 /sys/netipx/spx_usrreq.c
parentddc54b905617db9c71948d08d7e5f9ca0cce59a8 (diff)
downloadFreeBSD-src-eaec7254b67e5191f375fd6c56b4d2931a3bd189.zip
FreeBSD-src-eaec7254b67e5191f375fd6c56b4d2931a3bd189.tar.gz
In spx_input(), change a '&&' to a '||', as the spx trace code is able
to handle a NULL 'cb' here. MFC after: 1 month
Diffstat (limited to 'sys/netipx/spx_usrreq.c')
-rw-r--r--sys/netipx/spx_usrreq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c
index 022f1a9..c13dff5 100644
--- a/sys/netipx/spx_usrreq.c
+++ b/sys/netipx/spx_usrreq.c
@@ -366,7 +366,7 @@ spx_input(struct mbuf *m, struct ipxpcb *ipxp)
dropwithreset:
IPX_LOCK_ASSERT(ipxp);
- if (cb == NULL && (cb->s_ipxpcb->ipxp_socket->so_options & SO_DEBUG ||
+ if (cb == NULL || (cb->s_ipxpcb->ipxp_socket->so_options & SO_DEBUG ||
traceallspxs))
spx_trace(SA_DROP, (u_char)ostate, cb, &spx_savesi, 0);
IPX_UNLOCK(ipxp);
OpenPOWER on IntegriCloud