aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
diff options
context:
space:
mode:
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)
619 brcmf_dbg(ERROR, "dongle is not up\n"); 619 brcmf_dbg(ERROR, "dongle is not up\n");
620 return -ENODEV; 620 return -ENODEV;
621 } 621 }
622
623 /* finally, report dongle driver type */ 622 /* finally, report dongle driver type */
624 else if (drvr->iswl)
625 sprintf(info.driver, "wl");
626 else 623 else
627 sprintf(info.driver, "xx"); 624 sprintf(info.driver, "wl");
628 625
629 sprintf(info.version, "%lu", drvr->drv_version); 626 sprintf(info.version, "%lu", drvr->drv_version);
630 if (copy_to_user(uaddr, &info, sizeof(info))) 627 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)
734 goto done; 731 goto done;
735 } 732 }
736 733
737 if (!drvr->iswl) {
738 err = -EIO;
739 goto done;
740 }
741
742 /* 734 /*
743 * Intercept BRCMF_C_SET_KEY CMD - serialize M4 send and 735 * Intercept BRCMF_C_SET_KEY CMD - serialize M4 send and
744 * set key CMD to prevent M4 encryption. 736 * set key CMD to prevent M4 encryption.