From owner-svn-src-stable@FreeBSD.ORG  Tue May 12 00:27:21 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7F8D57BC;
 Tue, 12 May 2015 00:27:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6DC1B12C6;
 Tue, 12 May 2015 00:27:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4C0RL8e082927;
 Tue, 12 May 2015 00:27:21 GMT (envelope-from hiren@FreeBSD.org)
Received: (from hiren@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4C0RL4T082926;
 Tue, 12 May 2015 00:27:21 GMT (envelope-from hiren@FreeBSD.org)
Message-Id: <201505120027.t4C0RL4T082926@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hiren set sender to
 hiren@FreeBSD.org using -f
From: Hiren Panchasara <hiren@FreeBSD.org>
Date: Tue, 12 May 2015 00:27:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r282786 - stable/10/sys/sys
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Tue, 12 May 2015 00:27:21 -0000

Author: hiren
Date: Tue May 12 00:27:20 2015
New Revision: 282786
URL: https://svnweb.freebsd.org/changeset/base/282786

Log:
  Fix r282781:
  
  We should return OPAQUE from M_HASHTYPE_GET() if M_FLOWID is there and rsstype
  is not set.
  
  Submitted by:	hans

Modified:
  stable/10/sys/sys/mbuf.h

Modified: stable/10/sys/sys/mbuf.h
==============================================================================
--- stable/10/sys/sys/mbuf.h	Mon May 11 22:14:03 2015	(r282785)
+++ stable/10/sys/sys/mbuf.h	Tue May 12 00:27:20 2015	(r282786)
@@ -300,8 +300,9 @@ struct mbuf {
 /*
  * Handle M_FLOWID for legacy drivers still using them.
  */
-#define	M_HASHTYPE_GET(m)	((m->m_flags & M_FLOWID) ? M_HASHTYPE_OPAQUE \
-						    : (m)->m_pkthdr.rsstype)
+#define	M_HASHTYPE_GET(m)	(((m->m_flags & M_FLOWID) &&	    \
+    (m)->m_pkthdr.rsstype == M_HASHTYPE_NONE) ? M_HASHTYPE_OPAQUE : \
+    (m)->m_pkthdr.rsstype)
 #define	M_HASHTYPE_SET(m, v)	do {	    \
 	    if ((v) != M_HASHTYPE_NONE)	    \
 		m->m_flags |= M_FLOWID;	    \