diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-02-12 15:24:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-02-12 15:24:14 -0500 |
| commit | 841577c3d33b8a2bff66d1b506d8198b25900bde (patch) | |
| tree | 444ca28c7b9ed796d3949f019ae97d2c8ed5bd28 /drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | |
| parent | e9c653167710e5624c5576ee7d657c6b86878caf (diff) | |
| parent | 63c361f5114d81db789f8f5671c76c228c35b021 (diff) | |
| download | talos-obmc-linux-841577c3d33b8a2bff66d1b506d8198b25900bde.tar.gz talos-obmc-linux-841577c3d33b8a2bff66d1b506d8198b25900bde.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h index 2dc6a074e8ed..254feed2860e 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h @@ -491,7 +491,8 @@ void brcmf_free_vif(struct brcmf_cfg80211_vif *vif); s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag, const u8 *vndr_ie_buf, u32 vndr_ie_len); s32 brcmf_vif_clear_mgmt_ies(struct brcmf_cfg80211_vif *vif); -struct brcmf_tlv *brcmf_parse_tlvs(void *buf, int buflen, uint key); +const struct brcmf_tlv * +brcmf_parse_tlvs(const void *buf, int buflen, uint key); u16 channel_to_chanspec(struct brcmu_d11inf *d11inf, struct ieee80211_channel *ch); u32 wl_get_vif_state_all(struct brcmf_cfg80211_info *cfg, unsigned long state); |
