summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/11n_aggr.c
diff options
context:
space:
mode:
authorJohn W. Linville2014-07-10 23:00:24 +0200
committerJohn W. Linville2014-07-10 23:00:24 +0200
commit5c4d5e816c2cc86e17d09677b649be47fbc30e51 (patch)
treeb13327e59b6ea29095b9b33b4cdd5dffab9a66d3 /drivers/net/wireless/mwifiex/11n_aggr.c
parentbcma: add driver for PCIe Gen 2 core (diff)
parentrt2800usb: Don't perform DMA from stack (diff)
downloadkernel-qcow2-linux-5c4d5e816c2cc86e17d09677b649be47fbc30e51.tar.gz
kernel-qcow2-linux-5c4d5e816c2cc86e17d09677b649be47fbc30e51.tar.xz
kernel-qcow2-linux-5c4d5e816c2cc86e17d09677b649be47fbc30e51.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/mwifiex/11n_aggr.c')
-rw-r--r--drivers/net/wireless/mwifiex/11n_aggr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c
index b4c14b0fd3cb..8720a3d3c755 100644
--- a/drivers/net/wireless/mwifiex/11n_aggr.c
+++ b/drivers/net/wireless/mwifiex/11n_aggr.c
@@ -185,6 +185,7 @@ mwifiex_11n_aggregate_pkt(struct mwifiex_private *priv,
skb_reserve(skb_aggr, headroom + sizeof(struct txpd));
tx_info_aggr = MWIFIEX_SKB_TXCB(skb_aggr);
+ memset(tx_info_aggr, 0, sizeof(*tx_info_aggr));
tx_info_aggr->bss_type = tx_info_src->bss_type;
tx_info_aggr->bss_num = tx_info_src->bss_num;