Staging: rt2860/sta_ioctl.c: Two branches the same in rt_ioctl_giwscan()
authorRoel Kluin <roel.kluin@gmail.com>
Sun, 17 Jan 2010 15:44:37 +0000 (16:44 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 4 Mar 2010 00:42:48 +0000 (16:42 -0800)
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>
drivers/staging/rt2860/sta_ioctl.c

index d8fbe6c..de4b627 100644 (file)
@@ -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;