networking: make skb_push & __skb_push return void pointers

[mirror_ubuntu-artful-kernel.git] / net / mac80211 / status.c

diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index be47ac5cd8c8dd44a23247979f0d1742cf089026..da7427a415299e5c18c4c7c00255e80297aab032 100644 (file)
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -288,7 +288,7 @@ ieee80211_add_tx_radiotap_header(struct ieee80211_local *local,
        unsigned char *pos;
        u16 txflags;
 
-       rthdr = (struct ieee80211_radiotap_header *) skb_push(skb, rtap_len);
+       rthdr = skb_push(skb, rtap_len);
 
        memset(rthdr, 0, rtap_len);
        rthdr->it_len = cpu_to_le16(rtap_len);
@@ -546,6 +546,8 @@ static void ieee80211_report_used_skb(struct ieee80211_local *local,
                skb->wifi_acked_valid = 1;
                skb->wifi_acked = acked;
        }
+
+       ieee80211_led_tx(local);
 }
 
 /*
@@ -823,8 +825,6 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw,
                }
        }
 
-       ieee80211_led_tx(local);
-
        /* SNMP counters
         * Fragments are passed to low-level drivers as separate skbs, so these
         * are actually fragments, not frames. Update frame counters only for