Date: Sun, 15 Mar 2015 20:23:59 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r280063 - head/sys/dev/wpi Message-ID: <201503152023.t2FKNx6p058782@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Sun Mar 15 20:23:58 2015 New Revision: 280063 URL: https://svnweb.freebsd.org/changeset/base/280063 Log: Wrap cast to (struct wpi_node *) into WPI_NODE macros PR: kern/197143 Submitted by: Andriy Voskoboinyk <s3erios@gmail.com> 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:22:16 2015 (r280062) +++ head/sys/dev/wpi/if_wpi.c Sun Mar 15 20:23:58 2015 (r280063) @@ -1530,7 +1530,7 @@ wpi_node_free(struct ieee80211_node *ni) { struct ieee80211com *ic = ni->ni_ic; struct wpi_softc *sc = ic->ic_ifp->if_softc; - struct wpi_node *wn = (struct wpi_node *)ni; + struct wpi_node *wn = WPI_NODE(ni); if (wn->id >= WPI_ID_IBSS_MIN && wn->id <= WPI_ID_IBSS_MAX) { free_unr(sc->sc_unr, wn->id); @@ -2365,7 +2365,7 @@ wpi_tx_data(struct wpi_softc *sc, struct const struct ieee80211_txparam *tp; struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; - struct wpi_node *wn = (void *)ni; + struct wpi_node *wn = WPI_NODE(ni); struct ieee80211_channel *chan; struct ieee80211_frame *wh; struct ieee80211_key *k = NULL; @@ -2942,7 +2942,7 @@ static int wpi_add_node(struct wpi_softc *sc, struct ieee80211_node *ni) { struct ieee80211com *ic = ni->ni_ic; - struct wpi_node *wn = (void *)ni; + struct wpi_node *wn = WPI_NODE(ni); struct wpi_node_info node; DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__); @@ -2987,7 +2987,7 @@ wpi_add_broadcast_node(struct wpi_softc static int wpi_add_ibss_node(struct wpi_softc *sc, struct ieee80211_node *ni) { - struct wpi_node *wn = (void *)ni; + struct wpi_node *wn = WPI_NODE(ni); DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__); @@ -3005,7 +3005,7 @@ wpi_add_ibss_node(struct wpi_softc *sc, static void wpi_del_node(struct wpi_softc *sc, struct ieee80211_node *ni) { - struct wpi_node *wn = (void *)ni; + struct wpi_node *wn = WPI_NODE(ni); struct wpi_cmd_del_node node; int error; @@ -4014,7 +4014,7 @@ wpi_key_set(struct ieee80211vap *vap, co struct ieee80211com *ic = vap->iv_ic; struct ieee80211_node *ni = vap->iv_bss; struct wpi_softc *sc = ic->ic_ifp->if_softc; - struct wpi_node *wn = (void *)ni; + struct wpi_node *wn = WPI_NODE(ni); struct wpi_node_info node; uint16_t kflags; int error; @@ -4067,7 +4067,7 @@ wpi_key_delete(struct ieee80211vap *vap, struct ieee80211com *ic = vap->iv_ic; struct ieee80211_node *ni = vap->iv_bss; struct wpi_softc *sc = ic->ic_ifp->if_softc; - struct wpi_node *wn = (void *)ni; + struct wpi_node *wn = WPI_NODE(ni); struct wpi_node_info node; DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_DOING, __func__); Modified: head/sys/dev/wpi/if_wpivar.h ============================================================================== --- head/sys/dev/wpi/if_wpivar.h Sun Mar 15 20:22:16 2015 (r280062) +++ head/sys/dev/wpi/if_wpivar.h Sun Mar 15 20:23:58 2015 (r280063) @@ -96,6 +96,7 @@ struct wpi_node { struct ieee80211_node ni; /* must be the first */ uint8_t id; }; +#define WPI_NODE(ni) ((struct wpi_node *)(ni)) struct wpi_power_sample { uint8_t index;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503152023.t2FKNx6p058782>