diff options
| author | Mark Brown <broonie@kernel.org> | 2016-03-18 09:48:58 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-18 09:48:58 +0000 |
| commit | 917a9133a6b3c6cc2b6b5649d28c617a4ccac3e6 (patch) | |
| tree | 2d7ae3b1ae72fbad4f54eb39a651a2e51a79611e /net/mac80211/agg-rx.c | |
| parent | ddbcfcba5fdc56f30e4d02c3bac8cf965502cece (diff) | |
| parent | 6d0b88c88bf58bfd89ffbdaa97b03617fe8c6478 (diff) | |
Merge remote-tracking branch 'lsk/linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4lsk-v4.4-16.03
Diffstat (limited to 'net/mac80211/agg-rx.c')
| -rw-r--r-- | net/mac80211/agg-rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c index 10ad4ac1fa0b..367784be5df2 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c @@ -291,7 +291,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, } /* prepare A-MPDU MLME for Rx aggregation */ - tid_agg_rx = kmalloc(sizeof(struct tid_ampdu_rx), GFP_KERNEL); + tid_agg_rx = kzalloc(sizeof(*tid_agg_rx), GFP_KERNEL); if (!tid_agg_rx) goto end; |