From owner-svn-src-all@FreeBSD.ORG Sat Apr 26 23:39:43 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4DCEE187; Sat, 26 Apr 2014 23:39:43 +0000 (UTC) Received: from mail-qc0-x22c.google.com (mail-qc0-x22c.google.com [IPv6:2607:f8b0:400d:c01::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CF394120C; Sat, 26 Apr 2014 23:39:42 +0000 (UTC) Received: by mail-qc0-f172.google.com with SMTP id i8so5583108qcq.31 for ; Sat, 26 Apr 2014 16:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=OMPszRFLS+8OepZQl42bxBzjtp1QuVtJvD8tUMi3eyI=; b=ZIGevl0LY29TONTg5qgfBxj2TQNjyVkSKBACWhkibLoUvWj6d2HAylOx6YKS3f0HMB lscjBxllaSU/dKxxpZ8hDxRIvsuWyFGPaEck6fD7+dFGkP8BMX8m3BNG2ehno0bPkm+W 3GgW+4f+gB787lZEY58XZCnYwo8xA0cVD7mYeii7ZVmkgs6aO6VhzBn3uFnE+aC/ELrH 4eB2tbUWYJX0yymkaRjr0xqW5JSpDJJt9iSU70Gxjwt/3n4RlfQR3F/EzSrf0TMUunXL jDOMuM7VZ/vYTeM7irmSHaht4MmGzzdY31v93XsBVHEz9LVLsLol5GhZ0sjfWDDk8dxc DgAg== MIME-Version: 1.0 X-Received: by 10.224.88.201 with SMTP id b9mr138952qam.95.1398555582007; Sat, 26 Apr 2014 16:39:42 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.224.191.201 with HTTP; Sat, 26 Apr 2014 16:39:41 -0700 (PDT) In-Reply-To: <201404262322.s3QNMo6x006087@svn.freebsd.org> References: <201404262322.s3QNMo6x006087@svn.freebsd.org> Date: Sat, 26 Apr 2014 16:39:41 -0700 X-Google-Sender-Auth: RfWSPwoF6p_ISAFyDpYH6ViEVGs Message-ID: Subject: Re: svn commit: r264991 - head/sys/net80211 From: Adrian Chadd To: Ian Lepore Content-Type: text/plain; charset=UTF-8 Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 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: Sat, 26 Apr 2014 23:39:43 -0000 oops! -a On 26 April 2014 16:22, Ian Lepore wrote: > Author: ian > Date: Sat Apr 26 23:22:49 2014 > New Revision: 264991 > URL: http://svnweb.freebsd.org/changeset/base/264991 > > Log: > Use logical rather than bitwise OR in if() expression. > > Modified: > head/sys/net80211/ieee80211_ioctl.c > > Modified: head/sys/net80211/ieee80211_ioctl.c > ============================================================================== > --- head/sys/net80211/ieee80211_ioctl.c Sat Apr 26 23:09:01 2014 (r264990) > +++ head/sys/net80211/ieee80211_ioctl.c Sat Apr 26 23:22:49 2014 (r264991) > @@ -602,7 +602,7 @@ ieee80211_ioctl_getcurchan(struct ieee80 > * in use. When in RUN state report the vap-specific channel. > * Otherwise return curchan. > */ > - if (vap->iv_state == IEEE80211_S_RUN | vap->iv_state == IEEE80211_S_SLEEP) > + if (vap->iv_state == IEEE80211_S_RUN || vap->iv_state == IEEE80211_S_SLEEP) > c = vap->iv_bss->ni_chan; > else > c = ic->ic_curchan; >