diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_mac.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 49127e4b42c2..76ef2d83919d 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
@@ -360,11 +360,14 @@ void zd_mac_tx_failed(struct ieee80211_hw *hw) | |||
360 | { | 360 | { |
361 | struct sk_buff_head *q = &zd_hw_mac(hw)->ack_wait_queue; | 361 | struct sk_buff_head *q = &zd_hw_mac(hw)->ack_wait_queue; |
362 | struct sk_buff *skb; | 362 | struct sk_buff *skb; |
363 | struct ieee80211_tx_status status = {{0}}; | 363 | struct ieee80211_tx_status status; |
364 | 364 | ||
365 | skb = skb_dequeue(q); | 365 | skb = skb_dequeue(q); |
366 | if (skb == NULL) | 366 | if (skb == NULL) |
367 | return; | 367 | return; |
368 | |||
369 | memset(&status, 0, sizeof(status)); | ||
370 | |||
368 | tx_status(hw, skb, &status, 0); | 371 | tx_status(hw, skb, &status, 0); |
369 | } | 372 | } |
370 | 373 | ||
@@ -389,7 +392,8 @@ void zd_mac_tx_to_dev(struct sk_buff *skb, int error) | |||
389 | if (unlikely(error || | 392 | if (unlikely(error || |
390 | (cb->control->flags & IEEE80211_TXCTL_NO_ACK))) | 393 | (cb->control->flags & IEEE80211_TXCTL_NO_ACK))) |
391 | { | 394 | { |
392 | struct ieee80211_tx_status status = {{0}}; | 395 | struct ieee80211_tx_status status; |
396 | memset(&status, 0, sizeof(status)); | ||
393 | tx_status(hw, skb, &status, !error); | 397 | tx_status(hw, skb, &status, !error); |
394 | } else { | 398 | } else { |
395 | struct sk_buff_head *q = | 399 | struct sk_buff_head *q = |
@@ -603,7 +607,9 @@ static int filter_ack(struct ieee80211_hw *hw, struct ieee80211_hdr *rx_hdr, | |||
603 | tx_hdr = (struct ieee80211_hdr *)skb->data; | 607 | tx_hdr = (struct ieee80211_hdr *)skb->data; |
604 | if (likely(!compare_ether_addr(tx_hdr->addr2, rx_hdr->addr1))) | 608 | if (likely(!compare_ether_addr(tx_hdr->addr2, rx_hdr->addr1))) |
605 | { | 609 | { |
606 | struct ieee80211_tx_status status = {{0}}; | 610 | struct ieee80211_tx_status status; |
611 | |||
612 | memset(&status, 0, sizeof(status)); | ||
607 | status.flags = IEEE80211_TX_STATUS_ACK; | 613 | status.flags = IEEE80211_TX_STATUS_ACK; |
608 | status.ack_signal = stats->ssi; | 614 | status.ack_signal = stats->ssi; |
609 | __skb_unlink(skb, q); | 615 | __skb_unlink(skb, q); |