]> err.no Git - linux-2.6/commitdiff
zd1211rw: fix sparse warnings
authorJohannes Berg <johannes@sipsolutions.net>
Wed, 20 Feb 2008 11:09:25 +0000 (12:09 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 21 Feb 2008 01:11:55 +0000 (20:11 -0500)
This silences sparse when run on zd1211rw.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/zd1211rw/zd_mac.c

index 49127e4b42c24c3b22d5b8c8c6d3918e224acdfa..76ef2d83919d5bba00c415f754bbf878a94cd0fb 100644 (file)
@@ -360,11 +360,14 @@ void zd_mac_tx_failed(struct ieee80211_hw *hw)
 {
        struct sk_buff_head *q = &zd_hw_mac(hw)->ack_wait_queue;
        struct sk_buff *skb;
-       struct ieee80211_tx_status status = {{0}};
+       struct ieee80211_tx_status status;
 
        skb = skb_dequeue(q);
        if (skb == NULL)
                return;
+
+       memset(&status, 0, sizeof(status));
+
        tx_status(hw, skb, &status, 0);
 }
 
@@ -389,7 +392,8 @@ void zd_mac_tx_to_dev(struct sk_buff *skb, int error)
                if (unlikely(error ||
                    (cb->control->flags & IEEE80211_TXCTL_NO_ACK)))
                {
-                       struct ieee80211_tx_status status = {{0}};
+                       struct ieee80211_tx_status status;
+                       memset(&status, 0, sizeof(status));
                        tx_status(hw, skb, &status, !error);
                } else {
                        struct sk_buff_head *q =
@@ -603,7 +607,9 @@ static int filter_ack(struct ieee80211_hw *hw, struct ieee80211_hdr *rx_hdr,
                tx_hdr = (struct ieee80211_hdr *)skb->data;
                if (likely(!compare_ether_addr(tx_hdr->addr2, rx_hdr->addr1)))
                {
-                       struct ieee80211_tx_status status = {{0}};
+                       struct ieee80211_tx_status status;
+
+                       memset(&status, 0, sizeof(status));
                        status.flags = IEEE80211_TX_STATUS_ACK;
                        status.ack_signal = stats->ssi;
                        __skb_unlink(skb, q);