From owner-svn-src-stable-7@FreeBSD.ORG Wed Jan 20 18:55:41 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2C007106566C; Wed, 20 Jan 2010 18:55:41 +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 19D998FC14; Wed, 20 Jan 2010 18:55:41 +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 o0KIteZx088123; Wed, 20 Jan 2010 18:55:40 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0KIteSZ088118; Wed, 20 Jan 2010 18:55:40 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201001201855.o0KIteSZ088118@svn.freebsd.org> From: Michael Tuexen Date: Wed, 20 Jan 2010 18:55:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r202712 - stable/7/sys/netinet X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2010 18:55:41 -0000 Author: tuexen Date: Wed Jan 20 18:55:40 2010 New Revision: 202712 URL: http://svn.freebsd.org/changeset/base/202712 Log: MFC 199437 Use always LIST_EMPTY instead of sometime SCTP_LIST_EMPTY, which is defined as LIST_EMPTY. Modified: stable/7/sys/netinet/sctp_auth.c stable/7/sys/netinet/sctp_os_bsd.h stable/7/sys/netinet/sctp_pcb.c stable/7/sys/netinet/sctp_usrreq.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/netinet/sctp_auth.c ============================================================================== --- stable/7/sys/netinet/sctp_auth.c Wed Jan 20 18:50:49 2010 (r202711) +++ stable/7/sys/netinet/sctp_auth.c Wed Jan 20 18:55:40 2010 (r202712) @@ -573,7 +573,7 @@ sctp_insert_sharedkey(struct sctp_keyhea return (EINVAL); /* insert into an empty list? */ - if (SCTP_LIST_EMPTY(shared_keys)) { + if (LIST_EMPTY(shared_keys)) { LIST_INSERT_HEAD(shared_keys, new_skey, next); return (0); } Modified: stable/7/sys/netinet/sctp_os_bsd.h ============================================================================== --- stable/7/sys/netinet/sctp_os_bsd.h Wed Jan 20 18:50:49 2010 (r202711) +++ stable/7/sys/netinet/sctp_os_bsd.h Wed Jan 20 18:55:40 2010 (r202712) @@ -168,7 +168,6 @@ MALLOC_DECLARE(SCTP_M_SOCKOPT); * */ #define USER_ADDR_NULL (NULL) /* FIX ME: temp */ -#define SCTP_LIST_EMPTY(list) LIST_EMPTY(list) #if defined(SCTP_DEBUG) #define SCTPDBG(level, params...) \ Modified: stable/7/sys/netinet/sctp_pcb.c ============================================================================== --- stable/7/sys/netinet/sctp_pcb.c Wed Jan 20 18:50:49 2010 (r202711) +++ stable/7/sys/netinet/sctp_pcb.c Wed Jan 20 18:55:40 2010 (r202712) @@ -452,7 +452,7 @@ sctp_remove_ifa_from_ifn(struct sctp_ifa sctp_ifap->ifn_p->num_v4--; ifn_index = sctp_ifap->ifn_p->ifn_index; - if (SCTP_LIST_EMPTY(&sctp_ifap->ifn_p->ifalist)) { + if (LIST_EMPTY(&sctp_ifap->ifn_p->ifalist)) { /* remove the ifn, possibly freeing it */ sctp_delete_ifn(sctp_ifap->ifn_p, SCTP_ADDR_LOCKED); } else { @@ -4252,7 +4252,7 @@ sctp_delete_from_timewait(uint32_t tag, int i; chain = &SCTP_BASE_INFO(vtag_timewait)[(tag % SCTP_STACK_VTAG_HASH_SIZE)]; - if (!SCTP_LIST_EMPTY(chain)) { + if (!LIST_EMPTY(chain)) { LIST_FOREACH(twait_block, chain, sctp_nxt_tagblock) { for (i = 0; i < SCTP_NUMBER_IN_VTAG_BLOCK; i++) { if ((twait_block->vtag_block[i].v_tag == tag) && @@ -4282,7 +4282,7 @@ sctp_is_in_timewait(uint32_t tag, uint16 SCTP_INP_INFO_WLOCK(); chain = &SCTP_BASE_INFO(vtag_timewait)[(tag % SCTP_STACK_VTAG_HASH_SIZE)]; - if (!SCTP_LIST_EMPTY(chain)) { + if (!LIST_EMPTY(chain)) { LIST_FOREACH(twait_block, chain, sctp_nxt_tagblock) { for (i = 0; i < SCTP_NUMBER_IN_VTAG_BLOCK; i++) { if ((twait_block->vtag_block[i].v_tag == tag) && @@ -4312,7 +4312,7 @@ sctp_add_vtag_to_timewait(uint32_t tag, (void)SCTP_GETTIME_TIMEVAL(&now); chain = &SCTP_BASE_INFO(vtag_timewait)[(tag % SCTP_STACK_VTAG_HASH_SIZE)]; set = 0; - if (!SCTP_LIST_EMPTY(chain)) { + if (!LIST_EMPTY(chain)) { /* Block(s) present, lets find space, and expire on the fly */ LIST_FOREACH(twait_block, chain, sctp_nxt_tagblock) { for (i = 0; i < SCTP_NUMBER_IN_VTAG_BLOCK; i++) { @@ -4935,7 +4935,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, sctp_free_remote_addr(net); } - while (!SCTP_LIST_EMPTY(&asoc->sctp_restricted_addrs)) { + while (!LIST_EMPTY(&asoc->sctp_restricted_addrs)) { /* sa_ignore FREED_MEMORY */ laddr = LIST_FIRST(&asoc->sctp_restricted_addrs); sctp_remove_laddr(laddr); @@ -5581,7 +5581,7 @@ sctp_pcb_finish(void) */ for (i = 0; i < SCTP_STACK_VTAG_HASH_SIZE; i++) { chain = &SCTP_BASE_INFO(vtag_timewait)[i]; - if (!SCTP_LIST_EMPTY(chain)) { + if (!LIST_EMPTY(chain)) { prev_twait_block = NULL; LIST_FOREACH(twait_block, chain, sctp_nxt_tagblock) { if (prev_twait_block) { @@ -6340,7 +6340,7 @@ skip_vtag_check: chain = &SCTP_BASE_INFO(vtag_timewait[(tag % SCTP_STACK_VTAG_HASH_SIZE))]; /* Now what about timed wait ? */ - if (!SCTP_LIST_EMPTY(chain)) { + if (!LIST_EMPTY(chain)) { /* * Block(s) are present, lets see if we have this tag in the * list Modified: stable/7/sys/netinet/sctp_usrreq.c ============================================================================== --- stable/7/sys/netinet/sctp_usrreq.c Wed Jan 20 18:50:49 2010 (r202711) +++ stable/7/sys/netinet/sctp_usrreq.c Wed Jan 20 18:55:40 2010 (r202712) @@ -752,7 +752,7 @@ sctp_disconnect(struct socket *so) SCTP_INP_RLOCK(inp); if ((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) { - if (SCTP_LIST_EMPTY(&inp->sctp_asoc_list)) { + if (LIST_EMPTY(&inp->sctp_asoc_list)) { /* No connection */ SCTP_INP_RUNLOCK(inp); return (0);