svn commit: r184823 - in stable/7/sys: . modules/cxgb netinet
Robert Watson
rwatson at FreeBSD.org
Mon Nov 10 10:24:12 PST 2008
Author: rwatson
Date: Mon Nov 10 18:24:11 2008
New Revision: 184823
URL: http://svn.freebsd.org/changeset/base/184823
Log:
Merge r184298 from head to stable/7:
Remove endearing but syntactically unnecessary "return;" statements
directly before the final closeing brackets of some TCP functions.
Approved by: re (gnn)
Modified:
stable/7/sys/ (props changed)
stable/7/sys/modules/cxgb/ (props changed)
stable/7/sys/netinet/tcp_input.c
stable/7/sys/netinet/tcp_sack.c
stable/7/sys/netinet/tcp_syncache.c
Modified: stable/7/sys/netinet/tcp_input.c
==============================================================================
--- stable/7/sys/netinet/tcp_input.c Mon Nov 10 18:09:52 2008 (r184822)
+++ stable/7/sys/netinet/tcp_input.c Mon Nov 10 18:24:11 2008 (r184823)
@@ -878,7 +878,6 @@ drop:
free(s, M_TCPLOG);
if (m != NULL)
m_freem(m);
- return;
}
static void
@@ -2445,7 +2444,6 @@ drop:
if (headlocked)
INP_INFO_WUNLOCK(&tcbinfo);
m_freem(m);
- return;
}
/*
@@ -2504,7 +2502,6 @@ tcp_dropwithreset(struct mbuf *m, struct
return;
drop:
m_freem(m);
- return;
}
/*
Modified: stable/7/sys/netinet/tcp_sack.c
==============================================================================
--- stable/7/sys/netinet/tcp_sack.c Mon Nov 10 18:09:52 2008 (r184822)
+++ stable/7/sys/netinet/tcp_sack.c Mon Nov 10 18:24:11 2008 (r184823)
@@ -677,5 +677,4 @@ tcp_sack_adjust(struct tcpcb *tp)
if (SEQ_LT(tp->snd_nxt, cur->end))
return;
tp->snd_nxt = tp->snd_fack;
- return;
}
Modified: stable/7/sys/netinet/tcp_syncache.c
==============================================================================
--- stable/7/sys/netinet/tcp_syncache.c Mon Nov 10 18:09:52 2008 (r184822)
+++ stable/7/sys/netinet/tcp_syncache.c Mon Nov 10 18:24:11 2008 (r184823)
@@ -1297,7 +1297,6 @@ done:
#endif
*lsop = NULL;
m_freem(m);
- return;
}
static int
@@ -1624,7 +1623,6 @@ syncookie_generate(struct syncache_head
}
tcpstat.tcps_sc_sendcookie++;
- return;
}
static struct syncache *
More information about the svn-src-stable-7
mailing list