Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 352595
b: refs/heads/master
c: 0d61c91
h: refs/heads/master
i:
  352593: 3b2ff8c
  352591: eb2a27d
v: v3
  • Loading branch information
Tim Gardner authored and John W. Linville committed Feb 8, 2013
1 parent 70360b5 commit c920799
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 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: 708eb54f20334470ad92042547db0fef0cd60462
refs/heads/master: 0d61c9177cb9bf48dcec9c3d9205a309085d4318
8 changes: 7 additions & 1 deletion trunk/drivers/net/wireless/brcm80211/brcmsmac/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -7405,9 +7405,13 @@ brcms_c_bss_update_probe_resp(struct brcms_c_info *wlc,
struct brcms_bss_cfg *cfg,
bool suspend)
{
u16 prb_resp[BCN_TMPL_LEN / 2];
u16 *prb_resp;
int len = BCN_TMPL_LEN;

prb_resp = kmalloc(BCN_TMPL_LEN, GFP_ATOMIC);
if (!prb_resp)
return;

/*
* write the probe response to hardware, or save in
* the config structure
Expand Down Expand Up @@ -7441,6 +7445,8 @@ brcms_c_bss_update_probe_resp(struct brcms_c_info *wlc,

if (suspend)
brcms_c_enable_mac(wlc);

kfree(prb_resp);
}

void brcms_c_update_probe_resp(struct brcms_c_info *wlc, bool suspend)
Expand Down

0 comments on commit c920799

Please sign in to comment.