git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Staging: rt2860/sta_ioctl.c: Two branches the same in rt_ioctl_giwscan()
[pandora-kernel.git]
/
drivers
/
staging
/
rt2860
/
sta_ioctl.c
diff --git
a/drivers/staging/rt2860/sta_ioctl.c
b/drivers/staging/rt2860/sta_ioctl.c
index
d8fbe6c
..
de4b627
100644
(file)
--- 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;
/*================================ */
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;
iwe.u.freq.e = 0;
iwe.u.freq.i = 0;