diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-06-17 16:21:14 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-17 16:21:14 -0400 |
| commit | abf52f86aa0a49a7377350cafa8f218c4cd227e7 (patch) | |
| tree | dd9549023a99d37fb1bbcbaad9c10ae102a1882e /drivers/net/wireless/libertas_tf | |
| parent | 6a0076e02a884e86c762a7b63cb50c2e30067491 (diff) | |
| parent | 021570e55b7152843376b9d9f60624e3e05ac054 (diff) | |
| download | linux-abf52f86aa0a49a7377350cafa8f218c4cd227e7.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'drivers/net/wireless/libertas_tf')
| -rw-r--r-- | drivers/net/wireless/libertas_tf/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c index 6a04c2157f73..817fffc0de4b 100644 --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c @@ -549,7 +549,7 @@ int lbtf_rx(struct lbtf_private *priv, struct sk_buff *skb) prxpd = (struct rxpd *) skb->data; - stats.flag = 0; + memset(&stats, 0, sizeof(stats)); if (!(prxpd->status & cpu_to_le16(MRVDRV_RXPD_STATUS_OK))) stats.flag |= RX_FLAG_FAILED_FCS_CRC; stats.freq = priv->cur_freq; |