Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / net / mac80211 / rx.c

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 3090dd4342f6eee6f2d3bdba67493849622ac1a7..b791c41905640e0352602c38998a9adf8f79b3ab 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -1908,7 +1908,6 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
        unsigned int frag, seq;
        struct ieee80211_fragment_entry *entry;
        struct sk_buff *skb;
-       struct ieee80211_rx_status *status;
 
        hdr = (struct ieee80211_hdr *)rx->skb->data;
        fc = hdr->frame_control;
@@ -2034,9 +2033,6 @@ ieee80211_rx_h_defragment(struct ieee80211_rx_data *rx)
                dev_kfree_skb(skb);
        }
 
-       /* Complete frame has been reassembled - process it now */
-       status = IEEE80211_SKB_RXCB(rx->skb);
-
  out:
        ieee80211_led_rx(rx->local);
  out_no_led: