Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 277888
b: refs/heads/master
c: e78946e
h: refs/heads/master
v: v3
  • Loading branch information
Franky Lin authored and John W. Linville committed Nov 11, 2011
1 parent 64ff422 commit 2332d29
Show file tree
Hide file tree
Showing 2 changed files with 14 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: 99b72cde632b67603f4c7f18e8ff23a57b484478
refs/heads/master: e78946e198b9cf2656dceb5ea2c21759f469a125
18 changes: 13 additions & 5 deletions trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -2049,10 +2049,10 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_priv *cfg_priv,
notify_timestamp, notify_capability, notify_interval, notify_ie,
notify_ielen, notify_signal, GFP_KERNEL);

if (!bss) {
WL_ERR("cfg80211_inform_bss_frame error\n");
return -EINVAL;
}
if (!bss)
return -ENOMEM;

cfg80211_put_bss(bss);

return err;
}
Expand Down Expand Up @@ -2096,6 +2096,7 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_priv *cfg_priv,
struct ieee80211_channel *notify_channel;
struct brcmf_bss_info_le *bi = NULL;
struct ieee80211_supported_band *band;
struct cfg80211_bss *bss;
u8 *buf = NULL;
s32 err = 0;
u16 channel;
Expand Down Expand Up @@ -2149,10 +2150,17 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_priv *cfg_priv,
WL_CONN("signal: %d\n", notify_signal);
WL_CONN("notify_timestamp: %#018llx\n", notify_timestamp);

cfg80211_inform_bss(wiphy, notify_channel, bssid,
bss = cfg80211_inform_bss(wiphy, notify_channel, bssid,
notify_timestamp, notify_capability, notify_interval,
notify_ie, notify_ielen, notify_signal, GFP_KERNEL);

if (!bss) {
err = -ENOMEM;
goto CleanUp;
}

cfg80211_put_bss(bss);

CleanUp:

kfree(buf);
Expand Down

0 comments on commit 2332d29

Please sign in to comment.