diff options
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index 5f91fae5ebb..c524b04efe5 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | |||
@@ -706,60 +706,6 @@ static int brcmf_netdev_ioctl_entry(struct net_device *ndev, struct ifreq *ifr, | |||
706 | return -EOPNOTSUPP; | 706 | return -EOPNOTSUPP; |
707 | } | 707 | } |
708 | 708 | ||
709 | /* called only from within this driver. Sends a command to the dongle. */ | ||
710 | s32 brcmf_exec_dcmd(struct net_device *ndev, u32 cmd, void *arg, u32 len) | ||
711 | { | ||
712 | struct brcmf_dcmd dcmd; | ||
713 | s32 err = 0; | ||
714 | int buflen = 0; | ||
715 | bool is_set_key_cmd; | ||
716 | struct brcmf_if *ifp = netdev_priv(ndev); | ||
717 | struct brcmf_pub *drvr = ifp->drvr; | ||
718 | |||
719 | memset(&dcmd, 0, sizeof(dcmd)); | ||
720 | dcmd.cmd = cmd; | ||
721 | dcmd.buf = arg; | ||
722 | dcmd.len = len; | ||
723 | |||
724 | if (dcmd.buf != NULL) | ||
725 | buflen = min_t(uint, dcmd.len, BRCMF_DCMD_MAXLEN); | ||
726 | |||
727 | /* send to dongle (must be up, and wl) */ | ||
728 | if ((drvr->bus_if->state != BRCMF_BUS_DATA)) { | ||
729 | brcmf_dbg(ERROR, "DONGLE_DOWN\n"); | ||
730 | err = -EIO; | ||
731 | goto done; | ||
732 | } | ||
733 | |||
734 | /* | ||
735 | * Intercept BRCMF_C_SET_KEY CMD - serialize M4 send and | ||
736 | * set key CMD to prevent M4 encryption. | ||
737 | */ | ||
738 | is_set_key_cmd = ((dcmd.cmd == BRCMF_C_SET_KEY) || | ||
739 | ((dcmd.cmd == BRCMF_C_SET_VAR) && | ||
740 | !(strncmp("wsec_key", dcmd.buf, 9))) || | ||
741 | ((dcmd.cmd == BRCMF_C_SET_VAR) && | ||
742 | !(strncmp("bsscfg:wsec_key", dcmd.buf, 15)))); | ||
743 | if (is_set_key_cmd) | ||
744 | brcmf_netdev_wait_pend8021x(ndev); | ||
745 | |||
746 | err = brcmf_proto_dcmd(drvr, ifp->idx, &dcmd, buflen); | ||
747 | |||
748 | done: | ||
749 | if (err > 0) | ||
750 | err = 0; | ||
751 | |||
752 | return err; | ||
753 | } | ||
754 | |||
755 | int brcmf_netlink_dcmd(struct net_device *ndev, struct brcmf_dcmd *dcmd) | ||
756 | { | ||
757 | brcmf_dbg(TRACE, "enter: cmd %x buf %p len %d\n", | ||
758 | dcmd->cmd, dcmd->buf, dcmd->len); | ||
759 | |||
760 | return brcmf_exec_dcmd(ndev, dcmd->cmd, dcmd->buf, dcmd->len); | ||
761 | } | ||
762 | |||
763 | static int brcmf_netdev_stop(struct net_device *ndev) | 709 | static int brcmf_netdev_stop(struct net_device *ndev) |
764 | { | 710 | { |
765 | struct brcmf_if *ifp = netdev_priv(ndev); | 711 | struct brcmf_if *ifp = netdev_priv(ndev); |