From: Roel Kluin <roel.kluin@gmail.com>
Date: Sun, 17 Jan 2010 15:44:37 +0000 (+0100)
Subject: Staging: rt2860/sta_ioctl.c: Two branches the same in rt_ioctl_giwscan()
X-Git-Tag: MMI-PSA29.97-13-9~24618^2~1^2~172
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a2c3fdb996a926a45622428405a042f011eb03ba;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Staging: rt2860/sta_ioctl.c: Two branches the same in rt_ioctl_giwscan()

Regardless of the condition, the branches execute the same code

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index d8fbe6cc6941..de4b6277baee 100644
--- a/drivers/staging/rt2860/sta_ioctl.c
+++ b/drivers/staging/rt2860/sta_ioctl.c
@@ -975,10 +975,7 @@ int rt_ioctl_giwscan(struct net_device *dev,
 		/*================================ */
 		memset(&iwe, 0, sizeof(iwe));
 		iwe.cmd = SIOCGIWFREQ;
-		if (INFRA_ON(pAdapter) || ADHOC_ON(pAdapter))
-			iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel;
-		else
-			iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel;
+		iwe.u.freq.m = pAdapter->ScanTab.BssEntry[i].Channel;
 		iwe.u.freq.e = 0;
 		iwe.u.freq.i = 0;