svn commit: r264991 - head/sys/net80211

[Adrian Chadd]

oops!


-a


On 26 April 2014 16:22, Ian Lepore <ian at 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;
>