Author: tuexen
Date: Tue Nov 17 20:56:14 2009
New Revision: 199437
URL: http://svn.freebsd.org/changeset/base/199437
Log:
Use always LIST_EMPTY instead of sometime SCTP_LIST_EMPTY,
which is defined as LIST_EMPTY.
Approved by: rrs (mentor)
MFC after: 1 month
Modified:
head/sys/netinet/sctp_auth.c
head/sys/netinet/sctp_os_bsd.h
head/sys/netinet/sctp_pcb.c
head/sys/netinet/sctp_usrreq.c
Modified: head/sys/netinet/sctp_auth.c
==============================================================================
--- head/sys/netinet/sctp_auth.c Tue Nov 17 20:54:52 2009
(r199436)
+++ head/sys/netinet/sctp_auth.c Tue Nov 17 20:56:14 2009
(r199437)
@@ -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: head/sys/netinet/sctp_os_bsd.h
==============================================================================
--- head/sys/netinet/sctp_os_bsd.h Tue Nov 17 20:54:52 2009
(r199436)
+++ head/sys/netinet/sctp_os_bsd.h Tue Nov 17 20:56:14 2009
(r199437)
@@ -153,7 +153,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: head/sys/netinet/sctp_pcb.c
==============================================================================
--- head/sys/netinet/sctp_pcb.c Tue Nov 17 20:54:52 2009 (r199436)
+++ head/sys/netinet/sctp_pcb.c Tue Nov 17 20:56:14 2009 (r199437)
@@ -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 {
@@ -4262,7 +4262,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) &&
@@ -4292,7 +4292,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) &&
@@ -4326,7 +4326,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++) {
@@ -4953,7 +4953,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);
@@ -5617,7 +5617,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) {
@@ -6387,7 +6387,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: head/sys/netinet/sctp_usrreq.c
==============================================================================
--- head/sys/netinet/sctp_usrreq.c Tue Nov 17 20:54:52 2009
(r199436)
+++ head/sys/netinet/sctp_usrreq.c Tue Nov 17 20:56:14 2009
(r199437)
@@ -759,7 +759,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);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
