From owner-svn-src-head@FreeBSD.ORG  Sun Mar 15 20:18:10 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 65AE76FB;
 Sun, 15 Mar 2015 20:18:10 +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 51774E13;
 Sun, 15 Mar 2015 20:18:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FKIAZ9054081;
 Sun, 15 Mar 2015 20:18:10 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FKIACf054080;
 Sun, 15 Mar 2015 20:18:10 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201503152018.t2FKIACf054080@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 20:18:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280057 - 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 20:18:10 -0000

Author: adrian
Date: Sun Mar 15 20:18:09 2015
New Revision: 280057
URL: https://svnweb.freebsd.org/changeset/base/280057

Log:
  Use correct pointer for wpi_softc
  
  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 Mar 15 20:17:25 2015	(r280056)
+++ head/sys/dev/wpi/if_wpi.c	Sun Mar 15 20:18:09 2015	(r280057)
@@ -3850,9 +3850,8 @@ wpi_setup_beacon(struct wpi_softc *sc, s
 static void
 wpi_update_beacon(struct ieee80211vap *vap, int item)
 {
+	struct wpi_softc *sc = vap->iv_ic->ic_ifp->if_softc;
 	struct ieee80211_node *ni = vap->iv_bss;
-	struct ifnet *ifp = vap->iv_ifp;
-	struct wpi_softc *sc = ifp->if_softc;
 	int error;
 
 	WPI_LOCK(sc);
@@ -3970,8 +3969,7 @@ static int
 wpi_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k,
     ieee80211_keyix *keyix, ieee80211_keyix *rxkeyix)
 {
-	struct ifnet *ifp = vap->iv_ifp;
-	struct wpi_softc *sc = ifp->if_softc;
+	struct wpi_softc *sc = vap->iv_ic->ic_ifp->if_softc;
 
 	if (!(&vap->iv_nw_keys[0] <= k &&
 	    k < &vap->iv_nw_keys[IEEE80211_WEP_NKID])) {