Date: Sat, 26 Apr 2014 23:22:50 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264991 - head/sys/net80211 Message-ID: <201404262322.s3QNMo6x006087@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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?201404262322.s3QNMo6x006087>