svn commit: r264991 - head/sys/net80211

Ian Lepore ian at FreeBSD.org
Sat Apr 26 23:22:50 UTC 2014


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;


More information about the svn-src-head mailing list