diff options
| author | Roland Vossen <rvossen@broadcom.com> | 2011-09-13 07:49:55 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-16 18:41:54 (GMT) |
| commit | a8a4d920c31c296d15a9189d32b6c84578788fbe (patch) | |
| tree | cbe4ec63d93f6b164b6bcdcda0f63ddfd5e96563 | |
| parent | 9af07ef1febb8538d35d7613ae621e4ea5fa9631 (diff) | |
| download | linux-fsl-qoriq-a8a4d920c31c296d15a9189d32b6c84578788fbe.tar.xz | |
staging: brcm80211: cleaned up function brcmf_cfg80211_get_key()
Unnecessary endianess conversion and struct member setting was deleted.
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index b001e40..926b019 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -258,17 +258,6 @@ static void convert_key_from_CPU(struct brcmf_wsec_key *key) key->iv_initialized = cpu_to_le32(key->iv_initialized); } -static void convert_key_to_CPU(struct brcmf_wsec_key *key) -{ - key->index = le32_to_cpu(key->index); - key->len = le32_to_cpu(key->len); - key->algo = le32_to_cpu(key->algo); - key->flags = le32_to_cpu(key->flags); - key->rxiv.hi = le32_to_cpu(key->rxiv.hi); - key->rxiv.lo = le16_to_cpu(key->rxiv.lo); - key->iv_initialized = le32_to_cpu(key->iv_initialized); -} - static s32 brcmf_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len) { @@ -1722,7 +1711,6 @@ brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, void (*callback) (void *cookie, struct key_params * params)) { struct key_params params; - struct brcmf_wsec_key key; struct brcmf_cfg80211_priv *cfg_priv = wiphy_to_cfg(wiphy); struct brcmf_cfg80211_security *sec; s32 wsec; @@ -1733,12 +1721,7 @@ brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev, if (!check_sys_up(wiphy)) return -EIO; - memset(&key, 0, sizeof(key)); - key.index = key_idx; - convert_key_to_CPU(&key); memset(¶ms, 0, sizeof(params)); - params.key_len = (u8) min_t(u8, WLAN_MAX_KEY_LEN, key.len); - memcpy(params.key, key.data, params.key_len); err = brcmf_dev_ioctl(dev, BRCMF_C_GET_WSEC, &wsec, sizeof(wsec)); if (unlikely(err)) { |