From owner-svn-src-all@FreeBSD.ORG Sun Mar 15 20:52:48 2015 Return-Path: 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 969B8242; Sun, 15 Mar 2015 20:52:48 +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 68AD92EA; Sun, 15 Mar 2015 20:52:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2FKqmYU074245; Sun, 15 Mar 2015 20:52:48 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2FKqli4074240; Sun, 15 Mar 2015 20:52:48 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201503152052.t2FKqli4074240@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sun, 15 Mar 2015 20:52:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280085 - 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.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Mar 2015 20:52:48 -0000 Author: adrian Date: Sun Mar 15 20:52:47 2015 New Revision: 280085 URL: https://svnweb.freebsd.org/changeset/base/280085 Log: Add prefixes to field names. PR: kern/197143 Submitted by: Andriy Voskoboinyk Modified: head/sys/dev/wpi/if_wpi.c head/sys/dev/wpi/if_wpivar.h Modified: head/sys/dev/wpi/if_wpi.c ============================================================================== --- head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:51:56 2015 (r280084) +++ head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:52:47 2015 (r280085) @@ -614,17 +614,17 @@ wpi_vap_create(struct ieee80211com *ic, M_80211_VAP, M_NOWAIT | M_ZERO); if (wvp == NULL) return NULL; - vap = &wvp->vap; + vap = &wvp->wv_vap; ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac); if (opmode == IEEE80211_M_IBSS) wpi_init_beacon(wvp); /* Override with driver methods. */ - wvp->newstate = vap->iv_newstate; vap->iv_key_alloc = wpi_key_alloc; vap->iv_key_set = wpi_key_set; vap->iv_key_delete = wpi_key_delete; + wvp->wv_newstate = vap->iv_newstate; vap->iv_newstate = wpi_newstate; vap->iv_update_beacon = wpi_update_beacon; @@ -1704,7 +1704,7 @@ wpi_newstate(struct ieee80211vap *vap, e DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__); - return wvp->newstate(vap, nstate, arg); + return wvp->wv_newstate(vap, nstate, arg); } static void @@ -3955,7 +3955,7 @@ wpi_auth(struct wpi_softc *sc, struct ie static int wpi_config_beacon(struct wpi_vap *wvp) { - struct ieee80211com *ic = wvp->vap.iv_ic; + struct ieee80211com *ic = wvp->wv_vap.iv_ic; struct ieee80211_beacon_offsets *bo = &wvp->wv_boff; struct wpi_buf *bcn = &wvp->wv_bcbuf; struct wpi_softc *sc = ic->ic_ifp->if_softc; Modified: head/sys/dev/wpi/if_wpivar.h ============================================================================== --- head/sys/dev/wpi/if_wpivar.h Sun Mar 15 20:51:56 2015 (r280084) +++ head/sys/dev/wpi/if_wpivar.h Sun Mar 15 20:52:47 2015 (r280085) @@ -121,12 +121,12 @@ struct wpi_buf { }; struct wpi_vap { - struct ieee80211vap vap; + struct ieee80211vap wv_vap; struct wpi_buf wv_bcbuf; struct ieee80211_beacon_offsets wv_boff; - int (*newstate)(struct ieee80211vap *, + int (*wv_newstate)(struct ieee80211vap *, enum ieee80211_state, int); }; #define WPI_VAP(vap) ((struct wpi_vap *)(vap))