* [PATCH] rt2860/sta_ioctl.c: Two branches the same in rt_ioctl_giwscan()
@ 2010-01-17 15:44 Roel Kluin
0 siblings, 0 replies; only message in thread
From: Roel Kluin @ 2010-01-17 15:44 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, Andrew Morton, LKML
Regardless of the condition, the branches execute the same code
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
Maybe this needs a different fix?
diff --git a/drivers/staging/rt2860/sta_ioctl.c b/drivers/staging/rt2860/sta_ioctl.c
index d8fbe6c..de4b627 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;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-01-17 15:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-01-17 15:44 [PATCH] rt2860/sta_ioctl.c: Two branches the same in rt_ioctl_giwscan() Roel Kluin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).