Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324787
b: refs/heads/master
c: 7cd4e8c
h: refs/heads/master
i:
  324785: f591a2d
  324783: 778b77a
v: v3
  • Loading branch information
Devendra Naga authored and Greg Kroah-Hartman committed Sep 4, 2012
1 parent 66cbf6e commit d903f7f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 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: 6f6ed3db33720276068d70c17ce305e4132a123f
refs/heads/master: 7cd4e8c577bf6e927da70529553bf65b4240d8a8
10 changes: 3 additions & 7 deletions trunk/drivers/staging/csr/sme_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -2813,12 +2813,11 @@ u8 blockack_session_start(unifi_priv_t *priv,
}

/* create and populate the new BA session structure */
ba_session_tx = kmalloc(sizeof(ba_session_tx_struct), GFP_KERNEL);
ba_session_tx = kzalloc(sizeof(ba_session_tx_struct), GFP_KERNEL);
if (!ba_session_tx) {
unifi_error(priv, "%s: kmalloc failed for ba_session_tx\n", __FUNCTION__);
return FALSE;
}
memset(ba_session_tx, 0, sizeof(ba_session_tx_struct));

ba_session_tx->interfacePriv = interfacePriv;
ba_session_tx->tID = tID;
Expand Down Expand Up @@ -2903,26 +2902,23 @@ u8 blockack_session_start(unifi_priv_t *priv,
return FALSE;
}

ba_session_rx = kmalloc(sizeof(ba_session_rx_struct), GFP_KERNEL);
ba_session_rx = kzalloc(sizeof(ba_session_rx_struct), GFP_KERNEL);
if (!ba_session_rx) {
unifi_error(priv, "%s: kmalloc failed for ba_session_rx\n", __FUNCTION__);
return FALSE;
}
memset(ba_session_rx, 0, sizeof(ba_session_rx_struct));

ba_session_rx->wind_size = wind_size;
ba_session_rx->start_sn = ba_session_rx->expected_sn = start_sn;
ba_session_rx->trigger_ba_after_ssn = FALSE;

ba_session_rx->buffer = kmalloc(ba_session_rx->wind_size*sizeof(frame_desc_struct), GFP_KERNEL);
ba_session_rx->buffer = kzalloc(ba_session_rx->wind_size*sizeof(frame_desc_struct), GFP_KERNEL);
if (!ba_session_rx->buffer) {
kfree(ba_session_rx);
unifi_error(priv, "%s: kmalloc failed for buffer\n", __FUNCTION__);
return FALSE;
}

memset(ba_session_rx->buffer, 0, ba_session_rx->wind_size*sizeof(frame_desc_struct));

INIT_WORK(&ba_session_rx->send_ba_err_task, uf_send_ba_err_wq);
if (timeout) {
ba_session_rx->timeout = timeout;
Expand Down

0 comments on commit d903f7f

Please sign in to comment.