From owner-svn-src-stable@FreeBSD.ORG Thu Oct 28 18:57:17 2010 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35DCE106564A; Thu, 28 Oct 2010 18:57:17 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 08C198FC0C; Thu, 28 Oct 2010 18:57:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9SIvGmo023606; Thu, 28 Oct 2010 18:57:16 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9SIvGhO023604; Thu, 28 Oct 2010 18:57:16 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201010281857.o9SIvGhO023604@svn.freebsd.org> From: Michael Tuexen Date: Thu, 28 Oct 2010 18:57:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r214473 - stable/8/sys/netinet X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2010 18:57:17 -0000 Author: tuexen Date: Thu Oct 28 18:57:16 2010 New Revision: 214473 URL: http://svn.freebsd.org/changeset/base/214473 Log: MFC r212702: * Use !TAILQ_EMPTY() for checking if a tail queue is not empty. * Remove assignment without any effect. Modified: stable/8/sys/netinet/sctp_cc_functions.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/netinet/sctp_cc_functions.c ============================================================================== --- stable/8/sys/netinet/sctp_cc_functions.c Thu Oct 28 18:55:29 2010 (r214472) +++ stable/8/sys/netinet/sctp_cc_functions.c Thu Oct 28 18:57:16 2010 (r214473) @@ -171,7 +171,7 @@ sctp_cwnd_update_after_sack(struct sctp_ * So, first of all do we need to have a Early FR * timer running? */ - if (((TAILQ_FIRST(&asoc->sent_queue)) && + if ((!TAILQ_EMPTY(&asoc->sent_queue) && (net->ref_count > 1) && (net->flight_size < net->cwnd)) || (reneged_all)) { @@ -656,7 +656,6 @@ sctp_hs_cwnd_decrease(struct sctp_tcb *s int old_cwnd = net->cwnd; cur_val = net->cwnd >> 10; - indx = net->last_hs_used; if (cur_val < sctp_cwnd_adjust[0].cwnd) { /* normal mode */ net->ssthresh = net->cwnd / 2; @@ -793,7 +792,7 @@ sctp_hs_cwnd_update_after_sack(struct sc * So, first of all do we need to have a Early FR * timer running? */ - if (((TAILQ_FIRST(&asoc->sent_queue)) && + if ((!TAILQ_EMPTY(&asoc->sent_queue) && (net->ref_count > 1) && (net->flight_size < net->cwnd)) || (reneged_all)) { @@ -1279,7 +1278,7 @@ sctp_htcp_cwnd_update_after_sack(struct * So, first of all do we need to have a Early FR * timer running? */ - if (((TAILQ_FIRST(&asoc->sent_queue)) && + if ((!TAILQ_EMPTY(&asoc->sent_queue) && (net->ref_count > 1) && (net->flight_size < net->cwnd)) || (reneged_all)) {