diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-07-10 17:00:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-07-10 17:00:24 -0400 |
| commit | 5c4d5e816c2cc86e17d09677b649be47fbc30e51 (patch) | |
| tree | b13327e59b6ea29095b9b33b4cdd5dffab9a66d3 /drivers/net/wireless/mwifiex/txrx.c | |
| parent | f473832fece16611520bf54ad52b16c3f6db0a94 (diff) | |
| parent | 2c4db12ec469b9fcdad9f6bfd6fa20e65a563ac5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/mwifiex/txrx.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/txrx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/txrx.c b/drivers/net/wireless/mwifiex/txrx.c index 08205683f877..96a2126cc44b 100644 --- a/drivers/net/wireless/mwifiex/txrx.c +++ b/drivers/net/wireless/mwifiex/txrx.c | |||
| @@ -55,6 +55,7 @@ int mwifiex_handle_rx_packet(struct mwifiex_adapter *adapter, | |||
| 55 | return -1; | 55 | return -1; |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | memset(rx_info, 0, sizeof(*rx_info)); | ||
| 58 | rx_info->bss_num = priv->bss_num; | 59 | rx_info->bss_num = priv->bss_num; |
| 59 | rx_info->bss_type = priv->bss_type; | 60 | rx_info->bss_type = priv->bss_type; |
| 60 | 61 | ||