diff options
| author | nohee ko <noheek@broadcom.com> | 2010-10-13 21:26:52 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-14 19:21:53 (GMT) |
| commit | 5dc56c9f4c91caa58f4be6603cca4623610c4ad5 (patch) | |
| tree | 44cb76d08ee3f990039e1350e726f839e79f7867 | |
| parent | 7356f429d24e7ad97c0dec77b0777d5892c7657d (diff) | |
| download | linux-fsl-qoriq-5dc56c9f4c91caa58f4be6603cca4623610c4ad5.tar.xz | |
staging: brcm80211: brcmfmac: bug fix - scan result report
Scan result was reported with some duplicated information.
Those were about SSID/ rate. With this patch, the duplication
can be erased.
Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 7379034..20367a0 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -206,7 +206,7 @@ static void wl_ch_to_chanspec(int ch, ** information element utilities */ static void wl_rst_ie(struct wl_priv *wl); -static s32 wl_add_ie(struct wl_priv *wl, u8 t, u8 l, u8 *v); +static __used s32 wl_add_ie(struct wl_priv *wl, u8 t, u8 l, u8 *v); static s32 wl_mrg_ie(struct wl_priv *wl, u8 *ie_stream, u16 ie_size); static s32 wl_cp_ie(struct wl_priv *wl, u8 *dst, u16 dst_size); static u32 wl_get_ielen(struct wl_priv *wl); @@ -2297,9 +2297,15 @@ static s32 wl_inform_single_bss(struct wl_priv *wl, struct wl_bss_info *bi) mgmt->u.probe_resp.beacon_int = cpu_to_le16(bi->beacon_period); mgmt->u.probe_resp.capab_info = cpu_to_le16(bi->capability); wl_rst_ie(wl); - wl_add_ie(wl, WLAN_EID_SSID, bi->SSID_len, bi->SSID); - wl_add_ie(wl, WLAN_EID_SUPP_RATES, bi->rateset.count, - bi->rateset.rates); + /* + * wl_add_ie is not necessary because it can only add duplicated + * SSID, rate information to frame_buf + */ + /* + * wl_add_ie(wl, WLAN_EID_SSID, bi->SSID_len, bi->SSID); + * wl_add_ie(wl, WLAN_EID_SUPP_RATES, bi->rateset.count, + * bi->rateset.rates); + */ wl_mrg_ie(wl, ((u8 *) bi) + bi->ie_offset, bi->ie_length); wl_cp_ie(wl, mgmt->u.probe_resp.variable, WL_BSS_INFO_MAX - offsetof(struct wl_cfg80211_bss_info, frame_buf)); @@ -3939,7 +3945,7 @@ static void wl_rst_ie(struct wl_priv *wl) ie->offset = 0; } -static s32 wl_add_ie(struct wl_priv *wl, u8 t, u8 l, u8 *v) +static __used s32 wl_add_ie(struct wl_priv *wl, u8 t, u8 l, u8 *v) { struct wl_ie *ie = wl_to_ie(wl); s32 err = 0; |