Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Feb 2016 18:04:23 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r295709 - head/sys/netinet
Message-ID:  <201602171804.u1HI4Ncv013528@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tuexen
Date: Wed Feb 17 18:04:22 2016
New Revision: 295709
URL: https://svnweb.freebsd.org/changeset/base/295709

Log:
  Code cleanup which will silence a warning in PVS / D5245.

Modified:
  head/sys/netinet/sctp_timer.c
  head/sys/netinet/sctp_timer.h

Modified: head/sys/netinet/sctp_timer.c
==============================================================================
--- head/sys/netinet/sctp_timer.c	Wed Feb 17 17:52:46 2016	(r295708)
+++ head/sys/netinet/sctp_timer.c	Wed Feb 17 18:04:22 2016	(r295709)
@@ -85,7 +85,7 @@ sctp_audit_retranmission_queue(struct sc
 	    asoc->sent_queue_cnt);
 }
 
-int
+static int
 sctp_threshold_management(struct sctp_inpcb *inp, struct sctp_tcb *stcb,
     struct sctp_nets *net, uint16_t threshold)
 {
@@ -111,9 +111,9 @@ sctp_threshold_management(struct sctp_in
 				net->last_active = sctp_get_tick_count();
 				sctp_send_hb(stcb, net, SCTP_SO_NOT_LOCKED);
 				sctp_timer_stop(SCTP_TIMER_TYPE_HEARTBEAT,
-				    stcb->sctp_ep, stcb, net,
+				    inp, stcb, net,
 				    SCTP_FROM_SCTP_TIMER + SCTP_LOC_1);
-				sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, stcb->sctp_ep, stcb, net);
+				sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net);
 			}
 		}
 	}

Modified: head/sys/netinet/sctp_timer.h
==============================================================================
--- head/sys/netinet/sctp_timer.h	Wed Feb 17 17:52:46 2016	(r295708)
+++ head/sys/netinet/sctp_timer.h	Wed Feb 17 18:04:22 2016	(r295709)
@@ -46,10 +46,6 @@ sctp_find_alternate_net(struct sctp_tcb 
     struct sctp_nets *, int mode);
 
 int
-sctp_threshold_management(struct sctp_inpcb *, struct sctp_tcb *,
-    struct sctp_nets *, uint16_t);
-
-int
 sctp_t3rxt_timer(struct sctp_inpcb *, struct sctp_tcb *,
     struct sctp_nets *);
 int



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602171804.u1HI4Ncv013528>