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

PATCH New Roel Kluin 1 participant 1 message Jan 17, 2010 Staging

lore

Share & tools

lore

Roel Kluin

author

2010-01-17 15:39 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
Maybe this needs a different fix?

drivers/staging/rt2860/sta_ioctl.c +1 -4

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