]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
rtl818x: fix sparse warnings
authorJohannes Berg <johannes@sipsolutions.net>
Wed, 20 Feb 2008 11:05:59 +0000 (12:05 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 21 Feb 2008 01:11:49 +0000 (20:11 -0500)
This silences a few sparse warnings. There are two more where
I can't follow the code.

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

index 27ebd689aa2127f9bbf0e47f29114c9c98dabbd9..5e9a8ace0d815b4a660dc19aaa953e66aa6864e9 100644 (file)
@@ -135,13 +135,15 @@ static void rtl8180_handle_tx(struct ieee80211_hw *dev, unsigned int prio)
        while (skb_queue_len(&ring->queue)) {
                struct rtl8180_tx_desc *entry = &ring->desc[ring->idx];
                struct sk_buff *skb;
-               struct ieee80211_tx_status status = { {0} };
+               struct ieee80211_tx_status status;
                struct ieee80211_tx_control *control;
                u32 flags = le32_to_cpu(entry->flags);
 
                if (flags & RTL8180_TX_DESC_FLAG_OWN)
                        return;
 
+               memset(&status, 0, sizeof(status));
+
                ring->idx = (ring->idx + 1) % ring->entries;
                skb = __skb_dequeue(&ring->queue);
                pci_unmap_single(priv->pdev, le32_to_cpu(entry->tx_buf),
index 0d71716d750df858345bd81718369700e0322357..f44505994a0ee98f63826406ed457b7d65acebff 100644 (file)
@@ -113,10 +113,12 @@ void rtl8187_write_phy(struct ieee80211_hw *dev, u8 addr, u32 data)
 
 static void rtl8187_tx_cb(struct urb *urb)
 {
-       struct ieee80211_tx_status status = { {0} };
+       struct ieee80211_tx_status status;
        struct sk_buff *skb = (struct sk_buff *)urb->context;
        struct rtl8187_tx_info *info = (struct rtl8187_tx_info *)skb->cb;
 
+       memset(&status, 0, sizeof(status));
+
        usb_free_urb(info->urb);
        if (info->control)
                memcpy(&status.control, info->control, sizeof(status.control));