projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
net
/
mac80211
/
agg-rx.c
diff --git
a/net/mac80211/agg-rx.c
b/net/mac80211/agg-rx.c
index
1b8a5ca
..
3a8f881
100644
(file)
--- a/
net/mac80211/agg-rx.c
+++ b/
net/mac80211/agg-rx.c
@@
-327,7
+327,7
@@
void __ieee80211_start_rx_ba_session(struct sta_info *sta,
}
/* prepare A-MPDU MLME for Rx aggregation */
- tid_agg_rx = k
malloc(sizeof(struct tid_ampdu
_rx), GFP_KERNEL);
+ tid_agg_rx = k
zalloc(sizeof(*tid_agg
_rx), GFP_KERNEL);
if (!tid_agg_rx)
goto end;