View | Details | Raw Unified | Return to bug 197143 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/wpi/if_wpi.c (-8 / +4 lines)
Lines 3189-3196 Link Here
3189
static int
3189
static int
3190
wpi_set_txpower(struct wpi_softc *sc, int async)
3190
wpi_set_txpower(struct wpi_softc *sc, int async)
3191
{
3191
{
3192
	struct ifnet *ifp = sc->sc_ifp;
3192
	struct ieee80211com *ic = sc->sc_ifp->if_l2com;
3193
	struct ieee80211com *ic = ifp->if_l2com;
3194
	struct ieee80211_channel *ch;
3193
	struct ieee80211_channel *ch;
3195
	struct wpi_power_group *group;
3194
	struct wpi_power_group *group;
3196
	struct wpi_cmd_txpower cmd;
3195
	struct wpi_cmd_txpower cmd;
Lines 3251-3258 Link Here
3251
#define interpolate(x, x1, y1, x2, y2, n)	\
3250
#define interpolate(x, x1, y1, x2, y2, n)	\
3252
	((y1) + fdivround(((x) - (x1)) * ((y2) - (y1)), (x2) - (x1), n))
3251
	((y1) + fdivround(((x) - (x1)) * ((y2) - (y1)), (x2) - (x1), n))
3253
3252
3254
	struct ifnet *ifp = sc->sc_ifp;
3253
	struct ieee80211com *ic = sc->sc_ifp->if_l2com;
3255
	struct ieee80211com *ic = ifp->if_l2com;
3256
	struct wpi_power_sample *sample;
3254
	struct wpi_power_sample *sample;
3257
	int pwr, idx;
3255
	int pwr, idx;
3258
	u_int chan;
3256
	u_int chan;
Lines 4807-4814 Link Here
4807
static void
4805
static void
4808
wpi_scan_start(struct ieee80211com *ic)
4806
wpi_scan_start(struct ieee80211com *ic)
4809
{
4807
{
4810
	struct ifnet *ifp = ic->ic_ifp;
4808
	struct wpi_softc *sc = ic->ic_ifp->if_softc;
4811
	struct wpi_softc *sc = ifp->if_softc;
4812
4809
4813
	WPI_LOCK(sc);
4810
	WPI_LOCK(sc);
4814
	wpi_set_led(sc, WPI_LED_LINK, 20, 2);
4811
	wpi_set_led(sc, WPI_LED_LINK, 20, 2);
Lines 4883-4890 Link Here
4883
{
4880
{
4884
	struct ieee80211vap *vap = ss->ss_vap;
4881
	struct ieee80211vap *vap = ss->ss_vap;
4885
	struct ieee80211com *ic = vap->iv_ic;
4882
	struct ieee80211com *ic = vap->iv_ic;
4886
	struct ifnet *ifp = ic->ic_ifp;
4883
	struct wpi_softc *sc = ic->ic_ifp->if_softc;
4887
	struct wpi_softc *sc = ifp->if_softc;
4888
	int error;
4884
	int error;
4889
4885
4890
	if (sc->rxon.chan != ieee80211_chan2ieee(ic, ic->ic_curchan)) {
4886
	if (sc->rxon.chan != ieee80211_chan2ieee(ic, ic->ic_curchan)) {

Return to bug 197143