diff options
author | tuexen <tuexen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7> | 2012-05-14 09:00:59 +0000 |
---|---|---|
committer | tuexen <tuexen@9df1edf5-d72c-5b5f-11c0-5f5209eb73f7> | 2012-05-14 09:00:59 +0000 |
commit | 47674b651417d493ff4e0318113fd7beeef119db (patch) | |
tree | 45687c902850daf05c5c7317a0afe60baa590b92 /netinet6/sctp6_usrreq.c | |
parent | ba1ce00b85a38f8276850a5fd7bbc14c1dfdeff7 (diff) | |
download | usrsctplib-47674b651417d493ff4e0318113fd7beeef119db.tar.gz |
Sync with main sources.
git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@7738 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7
Diffstat (limited to 'netinet6/sctp6_usrreq.c')
-rw-r--r-- | netinet6/sctp6_usrreq.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/netinet6/sctp6_usrreq.c b/netinet6/sctp6_usrreq.c index f051363..dd465a7 100644 --- a/netinet6/sctp6_usrreq.c +++ b/netinet6/sctp6_usrreq.c @@ -33,7 +33,7 @@ #ifdef __FreeBSD__ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 233005 2012-03-15 14:22:05Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 235415 2012-05-13 19:25:21Z tuexen $"); #endif #include <netinet/sctp_os.h> @@ -524,10 +524,8 @@ sctp6_notify(struct sctp_inpcb *inp, struct socket *so; #endif - /* protection */ - int reason; - + /* protection */ if ((inp == NULL) || (stcb == NULL) || (net == NULL) || (sh == NULL) || (to == NULL)) { if (stcb) @@ -568,8 +566,7 @@ sctp6_notify(struct sctp_inpcb *inp, net->dest_state &= ~SCTP_ADDR_REACHABLE; net->dest_state &= ~SCTP_ADDR_PF; sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_DOWN, - stcb, SCTP_FAILED_THRESHOLD, - (void *)net, SCTP_SO_NOT_LOCKED); + stcb, 0, (void *)net, SCTP_SO_NOT_LOCKED); } SCTP_TCB_UNLOCK(stcb); } else if ((icmph->icmp6_code == ICMP_UNREACH_PROTOCOL) || @@ -582,8 +579,7 @@ sctp6_notify(struct sctp_inpcb *inp, * either case treat it like a OOTB abort with no * TCB */ - reason = SCTP_PEER_FAULTY; - sctp_abort_notification(stcb, reason, SCTP_SO_NOT_LOCKED); + sctp_abort_notification(stcb, 1, 0, NULL, SCTP_SO_NOT_LOCKED); #if defined (__APPLE__) || defined(SCTP_SO_LOCK_TESTING) so = SCTP_INP_SO(inp); atomic_add_int(&stcb->asoc.refcnt, 1); |