Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220329
b: refs/heads/master
c: 5dc56c9
h: refs/heads/master
i:
  220327: 7532d88
v: v3
  • Loading branch information
nohee ko authored and Greg Kroah-Hartman committed Oct 14, 2010
1 parent 2dae74e commit 37b2a8a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7356f429d24e7ad97c0dec77b0777d5892c7657d
refs/heads/master: 5dc56c9f4c91caa58f4be6603cca4623610c4ad5
16 changes: 11 additions & 5 deletions trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 37b2a8a

Please sign in to comment.