From owner-svn-src-head@freebsd.org  Wed Mar 30 06:48:10 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 E242DAE2F1A;
 Wed, 30 Mar 2016 06:48:10 +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 B29B4165E;
 Wed, 30 Mar 2016 06:48:10 +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 u2U6m9VP036484;
 Wed, 30 Mar 2016 06:48:09 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2U6m926036483;
 Wed, 30 Mar 2016 06:48:09 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201603300648.u2U6m926036483@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: Wed, 30 Mar 2016 06:48:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r297409 - head/sys/dev/bwn
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Mar 2016 06:48:11 -0000

Author: adrian
Date: Wed Mar 30 06:48:09 2016
New Revision: 297409
URL: https://svnweb.freebsd.org/changeset/base/297409

Log:
  [bwn] fix time_before -> ieee80211_time_before()
  
  Noticed by: Jia-Shiun Li <jiashiun@gmail.com>

Modified:
  head/sys/dev/bwn/if_bwn.c

Modified: head/sys/dev/bwn/if_bwn.c
==============================================================================
--- head/sys/dev/bwn/if_bwn.c	Wed Mar 30 06:13:58 2016	(r297408)
+++ head/sys/dev/bwn/if_bwn.c	Wed Mar 30 06:48:09 2016	(r297409)
@@ -2612,7 +2612,7 @@ bwn_phy_g_task_15s(struct bwn_mac *mac)
 	BWN_GETTIME(now);
 	if (bwn_has_hwpctl(mac)) {
 		expire = now - BWN_LO_PWRVEC_EXPIRE;
-		if (time_before(lo->pwr_vec_read_time, expire)) {
+		if (ieee80211_time_before(lo->pwr_vec_read_time, expire)) {
 			bwn_lo_get_powervector(mac);
 			bwn_phy_g_dc_lookup_init(mac, 0);
 		}
@@ -2621,7 +2621,7 @@ bwn_phy_g_task_15s(struct bwn_mac *mac)
 
 	expire = now - BWN_LO_CALIB_EXPIRE;
 	TAILQ_FOREACH_SAFE(cal, &lo->calib_list, list, tmp) {
-		if (!time_before(cal->calib_time, expire))
+		if (!ieee80211_time_before(cal->calib_time, expire))
 			continue;
 		if (BWN_BBATTCMP(&cal->bbatt, &pg->pg_bbatt) &&
 		    BWN_RFATTCMP(&cal->rfatt, &pg->pg_rfatt)) {
@@ -6149,7 +6149,7 @@ bwn_lo_save(struct bwn_mac *mac, struct 
 		BWN_PHY_WRITE(mac, BWN_PHY_CCK(0x2f), 0);
 
 	nanouptime(&ts);
-	if (time_before(lo->txctl_measured_time,
+	if (ieee80211_time_before(lo->txctl_measured_time,
 	    (ts.tv_nsec / 1000000 + ts.tv_sec * 1000) - BWN_LO_TXCTL_EXPIRE))
 		bwn_lo_measure_txctl_values(mac);
 
@@ -9365,7 +9365,7 @@ bwn_phy_txpower_check(struct bwn_mac *ma
 
 	BWN_GETTIME(now);
 
-	if (!(flags & BWN_TXPWR_IGNORE_TIME) && time_before(now, phy->nexttime))
+	if (!(flags & BWN_TXPWR_IGNORE_TIME) && ieee80211_time_before(now, phy->nexttime))
 		return;
 	phy->nexttime = now + 2 * 1000;