From owner-svn-src-user@FreeBSD.ORG  Mon Jun  8 04:08:19 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 220F91065670;
	Mon,  8 Jun 2009 04:08:19 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 10BC68FC1A;
	Mon,  8 Jun 2009 04:08:19 +0000 (UTC)
	(envelope-from kmacy@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 n5848I0l015256;
	Mon, 8 Jun 2009 04:08:18 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5848Ivv015255;
	Mon, 8 Jun 2009 04:08:18 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200906080408.n5848Ivv015255@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 8 Jun 2009 04:08:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193680 - user/kmacy/releng_7_2_fcs/sys/net
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 04:08:19 -0000

Author: kmacy
Date: Mon Jun  8 04:08:18 2009
New Revision: 193680
URL: http://svn.freebsd.org/changeset/base/193680

Log:
  - remove gratuitous ntohl
  - remove redundant conditional

Modified:
  user/kmacy/releng_7_2_fcs/sys/net/flowtable.c

Modified: user/kmacy/releng_7_2_fcs/sys/net/flowtable.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/net/flowtable.c	Mon Jun  8 03:41:38 2009	(r193679)
+++ user/kmacy/releng_7_2_fcs/sys/net/flowtable.c	Mon Jun  8 04:08:18 2009	(r193680)
@@ -337,6 +337,7 @@ ipv4_flow_lookup_hash_internal(struct mb
 	struct ip *ip = NULL;
 	uint8_t proto = 0;
 	int iphlen;
+	int needflowid;
 	uint32_t hash;
 	struct sockaddr_in *sin;
 	struct tcphdr *th;
@@ -358,8 +359,8 @@ ipv4_flow_lookup_hash_internal(struct mb
 
 	key[2] = sin->sin_addr.s_addr;
 
-	if ((*flags & FL_HASH_PORTS) == 0 &&
-	    (m == NULL || (m->m_flags & M_FLOWID)))
+	needflowid = (m != NULL && (m->m_flags & M_FLOWID) == 0);
+	if ((*flags & FL_HASH_PORTS) == 0 && needflowid)
 		goto skipports;
 
 	proto = ip->ip_p;
@@ -369,8 +370,8 @@ ipv4_flow_lookup_hash_internal(struct mb
 	switch (proto) {
 	case IPPROTO_TCP:
 		th = (struct tcphdr *)((caddr_t)ip + iphlen);
-		sport = ntohs(th->th_sport);
-		dport = ntohs(th->th_dport);
+		sport = th->th_sport;
+		dport = th->th_dport;
 		*flags |= th->th_flags;
 		if (*flags & TH_RST)
 			*flags |= FL_STALE;
@@ -393,7 +394,7 @@ ipv4_flow_lookup_hash_internal(struct mb
 	
 	}
 	*protop = proto;
-	if (m != NULL && (m->m_flags & M_FLOWID) == 0) {
+	if (needflowid) {
 		((uint16_t *)key)[0] = sport;
 		((uint16_t *)key)[1] = dport; 
 		m->m_flags |= M_FLOWID;