Date: Sat, 26 Apr 2014 16:39:41 -0700 From: Adrian Chadd <adrian@freebsd.org> To: Ian Lepore <ian@freebsd.org> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r264991 - head/sys/net80211 Message-ID: <CAJ-VmomnUbft=bYDTA4TBD12=8g9TByEch-9aB5iGjaA24WHfQ@mail.gmail.com> In-Reply-To: <201404262322.s3QNMo6x006087@svn.freebsd.org> References: <201404262322.s3QNMo6x006087@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
oops! -a On 26 April 2014 16:22, Ian Lepore <ian@freebsd.org> 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; >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ-VmomnUbft=bYDTA4TBD12=8g9TByEch-9aB5iGjaA24WHfQ>