From owner-svn-src-all@freebsd.org  Fri May 12 05:22:31 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 714FDD68F80;
 Fri, 12 May 2017 05:22:31 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 3E6B415BB;
 Fri, 12 May 2017 05:22:31 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4C5MUEN044550;
 Fri, 12 May 2017 05:22:30 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4C5MU2u044549;
 Fri, 12 May 2017 05:22:30 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201705120522.v4C5MU2u044549@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 12 May 2017 05:22:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r318215 - head/sys/dev/iwm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 12 May 2017 05:22:31 -0000

Author: adrian
Date: Fri May 12 05:22:29 2017
New Revision: 318215
URL: https://svnweb.freebsd.org/changeset/base/318215

Log:
  [iwm] change the check for ADD_STA status, use IWM_ADD_STA_STATUS_MASK.
  
  Obtained from:	dragonflybsd.git 74d41163ddac72b0d7ea7b7873d53fe134723a12

Modified:
  head/sys/dev/iwm/if_iwm.c

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c	Fri May 12 05:21:50 2017	(r318214)
+++ head/sys/dev/iwm/if_iwm.c	Fri May 12 05:22:29 2017	(r318215)
@@ -3925,7 +3925,7 @@ iwm_mvm_sta_send_to_fw(struct iwm_softc 
 	if (ret)
 		return ret;
 
-	switch (status) {
+	switch (status & IWM_ADD_STA_STATUS_MASK) {
 	case IWM_ADD_STA_SUCCESS:
 		break;
 	default:
@@ -3971,7 +3971,7 @@ iwm_mvm_add_int_sta_common(struct iwm_so
 	if (ret)
 		return ret;
 
-	switch (status) {
+	switch (status & IWM_ADD_STA_STATUS_MASK) {
 	case IWM_ADD_STA_SUCCESS:
 		IWM_DPRINTF(sc, IWM_DEBUG_RESET,
 		    "%s: Internal station added.\n", __func__);