From roel.kluin@gmail.com Wed Jan 27 14:31:53 2010 From: Roel Kluin Date: Sun, 17 Jan 2010 16:44:37 +0100 Subject: Staging: rt2860/sta_ioctl.c: Two branches the same in rt_ioctl_giwscan() To: Greg Kroah-Hartman , devel@driverdev.osuosl.org, Andrew Morton Message-ID: <4B533065.7070107@gmail.com> Regardless of the condition, the branches execute the same code Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rt2860/sta_ioctl.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- 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 * /*================================ */ 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;