d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge spx_usrreq.c:1.81 from HEAD to RELENG_6:

Browse Source 
In spx_input(), change a '&&' to a '||', as the spx trace code is able
  to handle a NULL 'cb' here.
This commit is contained in:
rwatson 2006-06-08 23:34:43 +00:00
parent 10b7eb98dd
commit f853872905
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/netipx/spx_usrreq.c
View File

@ -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);