From owner-svn-src-head@freebsd.org Wed Jun 1 19:35:22 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 42636B60152; Wed, 1 Jun 2016 19:35:22 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-it0-x22b.google.com (mail-it0-x22b.google.com [IPv6:2607:f8b0:4001:c0b::22b]) (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 06182170A; Wed, 1 Jun 2016 19:35:22 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by mail-it0-x22b.google.com with SMTP id i127so31185568ita.1; Wed, 01 Jun 2016 12:35:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc; bh=ZaBwXLIzVnz6wuSXYMF3oZbroSWOOReT2bneSYZcrwo=; b=zcdXn/cUTKoJVlxcB+3DVEMTqSC6CNCNe7wGXosQgqpYSbE8v+elkgFlyG1vw/83it I0HgYWTKtrtRnMJ2Ppr5eB2gfNqV1j5uPzVaetvFJq374NHQqgToPAHSLCbqc3nFZURC EiXmM/9cR5gjp5RrGv0V2O/mLW++c3j4OXpAhflhpWVBCPslj+4OlDfbL2jpdR+bqZ7g lhBYJSFp95jj8jSQQG2EO6AQ7hbddjT1dhFylcRO/NElYD155b2z0sbnUPaGhb+DbRPX 6ChrONq0T73ez6d32h224ga+OltMQZWBKfplPEoJB2953xSMTOnSBypXgLe/ugMuN9uT ov4A== 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; bh=ZaBwXLIzVnz6wuSXYMF3oZbroSWOOReT2bneSYZcrwo=; b=jPapgxRQhs+gaDDZD0khBvp53gRI/WAqtHCktS/51Yz5oa+LfBJRSxwvpTtlNmRtqH Px9b3CQo4LSCkI93dIB9CAysO4Q05c+rJdf3rdVKJoGzLb2/hjCh/IoY8Uzz/U6rYPej ZjKJxtR7mrFlbtTtGm6fRRL0VOkAWQ8hFxjO9EvnW8tZ46LFpwEobAZ1SXY2tR4jQHTT 2atnwYVrF3jMvFddlZFsYuO3N86Qk0d/yiz20tW2RzA9t5eKD5cZwhV/YGc3yTQZx8Nr i+jExZqbLqPXVagRTn37LEn4uGt3u8d32RhhysGuNNZbSNPx3JCy3qQNH43ffgm8jQ/l uvrA== X-Gm-Message-State: ALyK8tLpW5lIOZbuF4Pbi7P3pWUCLP28HVle0/UlObdu/zzGVQsDxgeh2SjMXI6DGKO5HdKV5UIG/yjZK2ECOg== MIME-Version: 1.0 X-Received: by 10.36.137.87 with SMTP id s84mr7947669itd.93.1464809721319; Wed, 01 Jun 2016 12:35:21 -0700 (PDT) Received: by 10.36.113.3 with HTTP; Wed, 1 Jun 2016 12:35:21 -0700 (PDT) In-Reply-To: <201606011457.u51EvrOI096173@repo.freebsd.org> References: <201606011457.u51EvrOI096173@repo.freebsd.org> Date: Wed, 1 Jun 2016 12:35:21 -0700 Message-ID: Subject: Re: svn commit: r301128 - head/sys/dev/urtwn From: Adrian Chadd To: Andriy Voskoboinyk Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Jun 2016 19:35:22 -0000 hi! Woo! Does this also help with IBSS? (Since we need to see all beacons so we can do adhoc joins.) -adrian On 1 June 2016 at 07:57, Andriy Voskoboinyk wrote: > Author: avos > Date: Wed Jun 1 14:57:53 2016 > New Revision: 301128 > URL: https://svnweb.freebsd.org/changeset/base/301128 > > Log: > urtwn: fix non-ERP BSS detection in HOSTAP mode. > > Receive all beacons in HOSTAP mode; they will give more information about > present non-ERP / legacy BSSs (used to choose protection mode). > > Tested with RTL8188CUS (HOSTAP, urtwn) + RTL8821AU (HOSTAP, 11b mode). > > Modified: > head/sys/dev/urtwn/if_urtwn.c > > Modified: head/sys/dev/urtwn/if_urtwn.c > ============================================================================== > --- head/sys/dev/urtwn/if_urtwn.c Wed Jun 1 14:16:16 2016 (r301127) > +++ head/sys/dev/urtwn/if_urtwn.c Wed Jun 1 14:57:53 2016 (r301128) > @@ -2627,10 +2627,11 @@ urtwn_newstate(struct ieee80211vap *vap, > if (ic->ic_promisc == 0) { > reg = urtwn_read_4(sc, R92C_RCR); > > - if (vap->iv_opmode != IEEE80211_M_HOSTAP) > + if (vap->iv_opmode != IEEE80211_M_HOSTAP) { > reg |= R92C_RCR_CBSSID_DATA; > - if (vap->iv_opmode != IEEE80211_M_IBSS) > - reg |= R92C_RCR_CBSSID_BCN; > + if (vap->iv_opmode != IEEE80211_M_IBSS) > + reg |= R92C_RCR_CBSSID_BCN; > + } > > urtwn_write_4(sc, R92C_RCR, reg); > } > @@ -4723,7 +4724,8 @@ urtwn_scan_start(struct ieee80211com *ic > > URTWN_LOCK(sc); > /* Receive beacons / probe responses from any BSSID. */ > - if (ic->ic_opmode != IEEE80211_M_IBSS) > + if (ic->ic_opmode != IEEE80211_M_IBSS && > + ic->ic_opmode != IEEE80211_M_HOSTAP) > urtwn_set_rx_bssid_all(sc, 1); > > /* Set gain for scanning. */ > @@ -4738,7 +4740,9 @@ urtwn_scan_end(struct ieee80211com *ic) > > URTWN_LOCK(sc); > /* Restore limitations. */ > - if (ic->ic_promisc == 0 && ic->ic_opmode != IEEE80211_M_IBSS) > + if (ic->ic_promisc == 0 && > + ic->ic_opmode != IEEE80211_M_IBSS && > + ic->ic_opmode != IEEE80211_M_HOSTAP) > urtwn_set_rx_bssid_all(sc, 0); > > /* Set gain under link. */ > @@ -4931,14 +4935,13 @@ urtwn_set_promisc(struct urtwn_softc *sc > if (vap->iv_state == IEEE80211_S_RUN) { > switch (vap->iv_opmode) { > case IEEE80211_M_STA: > - mask2 |= R92C_RCR_CBSSID_DATA; > - /* FALLTHROUGH */ > - case IEEE80211_M_HOSTAP: > mask2 |= R92C_RCR_CBSSID_BCN; > - break; > + /* FALLTHROUGH */ > case IEEE80211_M_IBSS: > mask2 |= R92C_RCR_CBSSID_DATA; > break; > + case IEEE80211_M_HOSTAP: > + break; > default: > device_printf(sc->sc_dev, "%s: undefined opmode %d\n", > __func__, vap->iv_opmode); >