From owner-svn-src-stable@FreeBSD.ORG  Mon Nov 10 18:24:12 2008
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
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 2B5041065677;
	Mon, 10 Nov 2008 18:24:12 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 186D88FC0C;
	Mon, 10 Nov 2008 18:24:12 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAAIOCMm077221;
	Mon, 10 Nov 2008 18:24:12 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAAIOBdY077218;
	Mon, 10 Nov 2008 18:24:11 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200811101824.mAAIOBdY077218@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 10 Nov 2008 18:24:11 +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: r184823 - in stable/7/sys: . modules/cxgb 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
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Nov 2008 18:24:12 -0000

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 *