svn commit: r282786 - stable/10/sys/sys

[Hiren Panchasara]

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;	    \