diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2006-03-27 00:08:32 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2006-03-27 00:08:32 +0000 |
| commit | dc6519ce4c364ff33f7ad10f6023f4e9a6e6e402 (patch) | |
| tree | f9032b9d9d8615a961c310055ef9c8f9d3791fd0 /sys/netipx/spx_usrreq.c | |
| parent | 416c476c4792280102de093005d5ca35e8e55051 (diff) | |
| download | src-dc6519ce4c364ff33f7ad10f6023f4e9a6e6e402.tar.gz src-dc6519ce4c364ff33f7ad10f6023f4e9a6e6e402.zip | |
In spx_input(), change a '&&' to a '||', as the spx trace code is able
to handle a NULL 'cb' here.
MFC after: 1 month
Notes
Notes:
svn path=/head/; revision=157164
Diffstat (limited to 'sys/netipx/spx_usrreq.c')
| -rw-r--r-- | sys/netipx/spx_usrreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/netipx/spx_usrreq.c b/sys/netipx/spx_usrreq.c index 022f1a949286..c13dff5ae71d 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); |