From owner-svn-src-all@FreeBSD.ORG  Sun May  3 23:24:21 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2A3FB4E2;
 Sun,  3 May 2015 23:24: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 188E4192C;
 Sun,  3 May 2015 23:24: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 t43NOKLI089441;
 Sun, 3 May 2015 23:24:20 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t43NOKHt089440;
 Sun, 3 May 2015 23:24:20 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201505032324.t43NOKHt089440@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 3 May 2015 23:24:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282389 - head/sys/dev/wpi
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.20
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: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 May 2015 23:24:21 -0000

Author: adrian
Date: Sun May  3 23:24:20 2015
New Revision: 282389
URL: https://svnweb.freebsd.org/changeset/base/282389

Log:
  Limit minimum threshold of missed beacons.
  
  PR:		kern/197143
  Submitted by:	 Andriy Voskoboinyk <s3erios@gmail.com>

Modified:
  head/sys/dev/wpi/if_wpi.c

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Sun May  3 23:21:16 2015	(r282388)
+++ head/sys/dev/wpi/if_wpi.c	Sun May  3 23:24:20 2015	(r282389)
@@ -2115,7 +2115,7 @@ wpi_notif_intr(struct wpi_softc *sc)
 		{
 			struct wpi_beacon_missed *miss =
 			    (struct wpi_beacon_missed *)(desc + 1);
-			uint32_t expected, misses, received;
+			uint32_t expected, misses, received, threshold;
 
 			bus_dmamap_sync(sc->rxq.data_dmat, data->map,
 			    BUS_DMASYNC_POSTREAD);
@@ -2123,6 +2123,7 @@ wpi_notif_intr(struct wpi_softc *sc)
 			misses = le32toh(miss->consecutive);
 			expected = le32toh(miss->expected);
 			received = le32toh(miss->received);
+			threshold = MAX(2, vap->iv_bmissthreshold);
 
 			DPRINTF(sc, WPI_DEBUG_BMISS,
 			    "%s: beacons missed %d/%d\n", __func__, misses,
@@ -2130,9 +2131,8 @@ wpi_notif_intr(struct wpi_softc *sc)
 
 			if (vap->iv_state == IEEE80211_S_RUN &&
 			    (ic->ic_flags & IEEE80211_F_SCAN) == 0 &&
-			    (misses >= vap->iv_bmissthreshold ||
-			    (received == 0 &&
-			    expected >= vap->iv_bmissthreshold)))
+			    (misses >= threshold ||
+			    (received == 0 && expected >= threshold)))
 				ieee80211_beacon_miss(ic);
 
 			break;