From owner-svn-src-head@FreeBSD.ORG  Sun Mar 15 21:27:51 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 E22C1481;
 Sun, 15 Mar 2015 21:27:51 +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 CDFB09DC;
 Sun, 15 Mar 2015 21:27:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FLRpAo091037;
 Sun, 15 Mar 2015 21:27:51 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FLRpYF091036;
 Sun, 15 Mar 2015 21:27:51 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201503152127.t2FLRpYF091036@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, 15 Mar 2015 21:27:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280115 - 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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Mar 2015 21:27:52 -0000

Author: adrian
Date: Sun Mar 15 21:27:50 2015
New Revision: 280115
URL: https://svnweb.freebsd.org/changeset/base/280115

Log:
  Reformatting changes.
  
  (attachment 154380)
  
  PR:		kern/197143
  Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>

Modified:
  head/sys/dev/wpi/if_wpivar.h

Modified: head/sys/dev/wpi/if_wpivar.h
==============================================================================
--- head/sys/dev/wpi/if_wpivar.h	Sun Mar 15 21:27:03 2015	(r280114)
+++ head/sys/dev/wpi/if_wpivar.h	Sun Mar 15 21:27:50 2015	(r280115)
@@ -213,8 +213,8 @@ struct wpi_softc {
 	void			(*sc_scan_curchan)(struct ieee80211_scan_state *,
 				    unsigned long);
 
-	struct wpi_rx_radiotap_header sc_rxtap;
-	struct wpi_tx_radiotap_header sc_txtap;
+	struct wpi_rx_radiotap_header	sc_rxtap;
+	struct wpi_tx_radiotap_header	sc_txtap;
 
 	/* Firmware image. */
 	const struct firmware	*fw_fp;
@@ -254,7 +254,7 @@ struct wpi_softc {
 	    MTX_NETWORK_LOCK, MTX_DEF)
 #define WPI_LOCK(_sc)		mtx_lock(&(_sc)->sc_mtx)
 #define WPI_UNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx)
-#define WPI_LOCK_ASSERT(sc)	mtx_assert(&(sc)->sc_mtx, MA_OWNED)
+#define WPI_LOCK_ASSERT(_sc)	mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
 #define WPI_LOCK_DESTROY(_sc)	mtx_destroy(&(_sc)->sc_mtx)
 
 #define WPI_RXON_LOCK_INIT(_sc) \