diff options
author | Hante Meuleman <meuleman@broadcom.com> | 2012-10-22 13:36:17 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-10-29 15:28:19 -0400 |
commit | 348a130cebe4235937a265c4d554beb665104d77 (patch) | |
tree | 9aebda0ccd1c08af5957c094169de204d25a9456 /drivers/net | |
parent | f368a5b6015c501fa291df81b52811be189b82ee (diff) |
brcmfmac: remove redundant function brcmf_c_mkiovar_bsscfg
function brcmf_c_mkiovar_bsscfg became redundant with refactoring
of firmware interface layer.
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c | 46 |
2 files changed, 0 insertions, 48 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h index 1589c1bfaa0..faa81efbfbb 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h | |||
@@ -709,8 +709,6 @@ extern const struct bcmevent_name bcmevent_names[]; | |||
709 | 709 | ||
710 | extern uint brcmf_c_mkiovar(char *name, char *data, uint datalen, | 710 | extern uint brcmf_c_mkiovar(char *name, char *data, uint datalen, |
711 | char *buf, uint len); | 711 | char *buf, uint len); |
712 | extern uint brcmf_c_mkiovar_bsscfg(char *name, char *data, uint datalen, | ||
713 | char *buf, uint buflen, s32 bssidx); | ||
714 | 712 | ||
715 | extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev); | 713 | extern int brcmf_netdev_wait_pend8021x(struct net_device *ndev); |
716 | 714 | ||
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c index a081e683743..aa4f719a51a 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c | |||
@@ -88,52 +88,6 @@ brcmf_c_mkiovar(char *name, char *data, uint datalen, char *buf, uint buflen) | |||
88 | return len; | 88 | return len; |
89 | } | 89 | } |
90 | 90 | ||
91 | uint | ||
92 | brcmf_c_mkiovar_bsscfg(char *name, char *data, uint datalen, | ||
93 | char *buf, uint buflen, s32 bssidx) | ||
94 | { | ||
95 | const s8 *prefix = "bsscfg:"; | ||
96 | s8 *p; | ||
97 | u32 prefixlen; | ||
98 | u32 namelen; | ||
99 | u32 iolen; | ||
100 | __le32 bssidx_le; | ||
101 | |||
102 | if (bssidx == 0) | ||
103 | return brcmf_c_mkiovar(name, data, datalen, buf, buflen); | ||
104 | |||
105 | prefixlen = (u32) strlen(prefix); /* lengh of bsscfg prefix */ | ||
106 | namelen = (u32) strlen(name) + 1; /* lengh of iovar name + null */ | ||
107 | iolen = prefixlen + namelen + sizeof(bssidx_le) + datalen; | ||
108 | |||
109 | if ((u32)buflen < iolen) { | ||
110 | brcmf_dbg(ERROR, "buffer is too short\n"); | ||
111 | return 0; | ||
112 | } | ||
113 | |||
114 | p = buf; | ||
115 | |||
116 | /* copy prefix, no null */ | ||
117 | memcpy(p, prefix, prefixlen); | ||
118 | p += prefixlen; | ||
119 | |||
120 | /* copy iovar name including null */ | ||
121 | memcpy(p, name, namelen); | ||
122 | p += namelen; | ||
123 | |||
124 | /* bss config index as first data */ | ||
125 | bssidx_le = cpu_to_le32(bssidx); | ||
126 | memcpy(p, &bssidx_le, sizeof(bssidx_le)); | ||
127 | p += sizeof(bssidx_le); | ||
128 | |||
129 | /* parameter buffer follows */ | ||
130 | if (datalen) | ||
131 | memcpy(p, data, datalen); | ||
132 | |||
133 | return iolen; | ||
134 | |||
135 | } | ||
136 | |||
137 | bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, | 91 | bool brcmf_c_prec_enq(struct device *dev, struct pktq *q, |
138 | struct sk_buff *pkt, int prec) | 92 | struct sk_buff *pkt, int prec) |
139 | { | 93 | { |