From owner-p4-projects@FreeBSD.ORG  Tue Jul 19 11:20:28 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 26DB91065675; Tue, 19 Jul 2011 11:20:28 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE6911065673
	for <perforce@FreeBSD.org>; Tue, 19 Jul 2011 11:20:27 +0000 (UTC)
	(envelope-from syuu@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id CD12E8FC13
	for <perforce@FreeBSD.org>; Tue, 19 Jul 2011 11:20:27 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p6JBKR7X069123
	for <perforce@FreeBSD.org>; Tue, 19 Jul 2011 11:20:27 GMT
	(envelope-from syuu@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p6JBKRjk069119
	for perforce@freebsd.org; Tue, 19 Jul 2011 11:20:27 GMT
	(envelope-from syuu@FreeBSD.org)
Date: Tue, 19 Jul 2011 11:20:27 GMT
Message-Id: <201107191120.p6JBKRjk069119@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	syuu@FreeBSD.org using -f
From: Takuya ASADA <syuu@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 196392 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 19 Jul 2011 11:20:28 -0000

http://p4web.freebsd.org/@@196392?ac=10

Change 196392 by syuu@kikurage on 2011/07/19 11:19:28

	Define RSSTYPE on header.

Affected files ...

.. //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#10 edit
.. //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.h#2 edit

Differences ...

==== //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.c#10 (text+ko) ====

@@ -4503,20 +4503,21 @@
 			rxr->fmp->m_pkthdr.flowid = rss;
 			rxr->fmp->m_flags |= M_FLOWID;
 			switch (rsstype) {
-			case 1:
+			case IGB_HASH_TCP_IPV4:
 				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_TCP_IPV4);
 				break;
-			case 2:
-			case 7:
+			case IGB_HASH_IPV4:
+			case IGB_HASH_UDP_IPV4:
 				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_IPV4);
 				break;
-			case 3:
-			case 6:
+			case IGB_HASH_TCP_IPV6:
+			case IGB_HASH_TCP_IPV6_EX:
 				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_TCP_IPV6);
 				break;
-			case 4:
-			case 8:
-			case 9:
+			case IGB_HASH_IPV6:
+			case IGB_HASH_IPV6_EX:
+			case IGB_HASH_UDP_IPV6:
+			case IGB_HASH_UDP_IPV6_EX:
 				M_HASHTYPE_SET(rxr->fmp, M_HASHTYPE_RSS_IPV6);
 				break;
 			default:

==== //depot/projects/soc2011/mq_bpf/src/sys/dev/e1000/if_igb.h#2 (text+ko) ====

@@ -536,6 +536,15 @@
 }
 #endif
 
+#define IGB_HASH_NONE		0x0
+#define IGB_HASH_TCP_IPV4	0x1
+#define IGB_HASH_IPV4		0x2
+#define IGB_HASH_TCP_IPV6	0x3
+#define IGB_HASH_IPV6_EX	0x4
+#define IGB_HASH_IPV6		0x5
+#define IGB_HASH_TCP_IPV6_EX	0x6
+#define IGB_HASH_UDP_IPV4	0x7
+#define IGB_HASH_UDP_IPV6	0x8
+#define IGB_HASH_UDP_IPV6_EX	0x9
+
 #endif /* _IGB_H_DEFINED_ */
-
-