From owner-freebsd-current@FreeBSD.ORG Mon Jun 1 20:20:36 2015 Return-Path: Delivered-To: current@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 0930EFF1 for ; Mon, 1 Jun 2015 20:20:36 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9D0CD1D78 for ; Mon, 1 Jun 2015 20:20:35 +0000 (UTC) (envelope-from oliver.pinter@hardenedbsd.org) Received: by wibdq8 with SMTP id dq8so40010232wib.1 for ; Mon, 01 Jun 2015 13:20:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=Bx2uPLNjt2g2Ycuf8k+3KaS/N++UW7Y+YKU90qIdC40=; b=P7gKqG5CMI7+iCkS5i0Z3unUJEliPL7EV564CFoX3R3qpV3ti69koIIvl9sM7MBiM3 zo+w9xEqgfyPwvcu56ZD/s8jWa6A55F2sSRtqNU2NJCcsoyPEwP5w1/lxLcI+iRSX0Vm ee3QwEghOQg2LtciUxXWa/YVmm/pywikWxOfcel/nLwZup7H4GIhcgJ8n92NptQyu4lN e+wGJUTjMIbDKrppNMXA0EzN0Xoytbw0PCicNDikYpDF58lVC4WMVQBlbW3xNNet6pY5 e/YyMfYWoZPqCburONaJlAqxr6IquMmxPUpPyzW4XK6zlp9TI5ZF6jtwtZhdcwGKFWRt /ahQ== X-Gm-Message-State: ALoCoQm3dFwH8090S2QGdv6r1hQGpZZqThJUYayfspZdOFoEkYV/VGaYCoi5yaoxZaPSz6RHMZV/ MIME-Version: 1.0 X-Received: by 10.194.71.226 with SMTP id y2mr28606742wju.34.1433188533008; Mon, 01 Jun 2015 12:55:33 -0700 (PDT) Received: by 10.194.162.225 with HTTP; Mon, 1 Jun 2015 12:55:32 -0700 (PDT) In-Reply-To: References: <20150529151405.GA8509@ns.kevlo.org> <55686E8F.3030400@FreeBSD.org> <20150601153717.GX73119@FreeBSD.org> Date: Mon, 1 Jun 2015 21:55:32 +0200 Message-ID: Subject: Re: converted ath(4) for testing Was: [Testers needed!] WiFi drivers changes From: Oliver Pinter To: Gleb Smirnoff Cc: Lev Serebryakov , Oliver Pinter , Adrian Chadd , current@freebsd.org Content-Type: text/plain; charset=UTF-8 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2015 20:20:36 -0000 On Mon, Jun 1, 2015 at 9:47 PM, Oliver Pinter wrote: > On Mon, Jun 1, 2015 at 5:37 PM, Gleb Smirnoff wrote: >> Hi! >> >> I've converted the ath(4), probably the most complex ieee80211 driver. >> >> The updated diff is uploaded to https://reviews.freebsd.org/D2655. >> >> Pretty sure it will panic or fail on first try :) Nevertheless, >> asking for your help. Please try to run it and report any problems >> to me. > > Hi! > > Do you have compile tested the code? I got this build error: > > --- if_ath.o --- > /usr/src/sys/dev/ath/if_ath.c:5732:26: error: no member named 'ic_ifp' > in 'struct ieee80211com'; did you mean 'ic_dfs'? > struct ifnet *ifp = ic->ic_ifp; > ^~~~~~ > ic_dfs > /usr/src/sys/net80211/ieee80211_var.h:197:29: note: 'ic_dfs' declared here > struct ieee80211_dfs_state ic_dfs; /* DFS state */ > ^ > /usr/src/sys/dev/ath/if_ath.c:5732:16: error: initializing 'struct > ifnet *' with an expression of incompatible type 'struct > ieee80211_dfs_state' > struct ifnet *ifp = ic->ic_ifp; > ^ > diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c index 53763a6..b719ed4 100644 --- a/sys/dev/ath/if_ath.c +++ b/sys/dev/ath/if_ath.c @@ -5729,8 +5729,7 @@ ath_scan_end(struct ieee80211com *ic) static void ath_update_chw(struct ieee80211com *ic) { - struct ifnet *ifp = ic->ic_ifp; - struct ath_softc *sc = ifp->if_softc; + struct ath_softc *sc = ic->ic_softc; DPRINTF(sc, ATH_DEBUG_STATE, "%s: called\n", __func__); ath_set_channel(ic); diff --git a/sys/dev/ath/if_ath_tdma.c b/sys/dev/ath/if_ath_tdma.c index fd23db1..d4c9ccd 100644 --- a/sys/dev/ath/if_ath_tdma.c +++ b/sys/dev/ath/if_ath_tdma.c @@ -359,7 +359,7 @@ ath_tdma_update(struct ieee80211_node *ni, #define TU_TO_TSF(_tu) (((u_int64_t)(_tu)) << 10) struct ieee80211vap *vap = ni->ni_vap; struct ieee80211com *ic = ni->ni_ic; - struct ath_softc *sc = ic->ic_ifp->if_softc; + struct ath_softc *sc = ic->ic_softc; struct ath_hal *ah = sc->sc_ah; const HAL_RATE_TABLE *rt = sc->sc_currates; u_int64_t tsf, rstamp, nextslot, nexttbtt, nexttbtt_full; >> >> -- >> Totus tuus, Glebius. >> _______________________________________________ >> freebsd-current@freebsd.org mailing list >> http://lists.freebsd.org/mailman/listinfo/freebsd-current >> To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"