From 1bcc3f93fdcb2f699f376ab854f286068049272c Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Thu, 3 Nov 2011 10:40:46 +0100 Subject: [PATCH] --- yaml --- r: 277770 b: refs/heads/master c: 0b62ffb53c9732e02ec77ae795f1e03cb2f2d406 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fb3674e584a7..35232424d315 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e5202a406896fb6d656d0e7d3f2f1cbfdda6384 +refs/heads/master: 0b62ffb53c9732e02ec77ae795f1e03cb2f2d406 diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c index 094fd57099cf..7217019d1ed9 100644 --- a/trunk/net/mac80211/main.c +++ b/trunk/net/mac80211/main.c @@ -126,8 +126,8 @@ bool ieee80211_cfg_on_oper_channel(struct ieee80211_local *local) return false; /* Check current hardware-config against oper_channel. */ - if ((local->oper_channel != local->hw.conf.channel) || - (local->_oper_channel_type != local->hw.conf.channel_type)) + if (local->oper_channel != local->hw.conf.channel || + local->_oper_channel_type != local->hw.conf.channel_type) return false; return true;