aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
diff options
context:
space:
mode:
authorHante Meuleman <[email protected]>2012-10-22 10:36:15 -0700
committerJohn W. Linville <[email protected]>2012-10-29 15:28:17 -0400
commit91917c77d229be369df007e6a6f5638bca26cc2b (patch)
treeb137035cba9bd95cc6d9ab031df9bda8cbb5ce80 /drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
parent81f5dcb8083077ca9bca10ca8e34bc8daf768dce (diff)
brcmfmac: remove unused iswl variable.
Variable iswl always gets initialised to the same and support for this var is not needed. Reviewed-by: Arend Van Spriel <[email protected]> Signed-off-by: Hante Meuleman <[email protected]> Signed-off-by: Franky Lin <[email protected]> Signed-off-by: John W. Linville <[email protected]>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 189c5be2b052..5f91fae5ebb1 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -619,12 +619,9 @@ static int brcmf_ethtool(struct brcmf_pub *drvr, void __user *uaddr)
brcmf_dbg(ERROR, "dongle is not up\n");
return -ENODEV;
}
-
/* finally, report dongle driver type */
- else if (drvr->iswl)
- sprintf(info.driver, "wl");
else
- sprintf(info.driver, "xx");
+ sprintf(info.driver, "wl");
sprintf(info.version, "%lu", drvr->drv_version);
if (copy_to_user(uaddr, &info, sizeof(info)))
@@ -734,11 +731,6 @@ s32 brcmf_exec_dcmd(struct net_device *ndev, u32 cmd, void *arg, u32 len)
goto done;
}
- if (!drvr->iswl) {
- err = -EIO;
- goto done;
- }
-
/*
* Intercept BRCMF_C_SET_KEY CMD - serialize M4 send and
* set key CMD to prevent M4 encryption.