diff options
Diffstat (limited to 'net/mac80211/main.c')
-rw-r--r-- | net/mac80211/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index 092a017b237e..5b69f5f07299 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c | |||
@@ -330,19 +330,16 @@ static void ieee80211_tasklet_handler(unsigned long data) | |||
330 | { | 330 | { |
331 | struct ieee80211_local *local = (struct ieee80211_local *) data; | 331 | struct ieee80211_local *local = (struct ieee80211_local *) data; |
332 | struct sk_buff *skb; | 332 | struct sk_buff *skb; |
333 | struct ieee80211_rx_status rx_status; | ||
334 | struct ieee80211_ra_tid *ra_tid; | 333 | struct ieee80211_ra_tid *ra_tid; |
335 | 334 | ||
336 | while ((skb = skb_dequeue(&local->skb_queue)) || | 335 | while ((skb = skb_dequeue(&local->skb_queue)) || |
337 | (skb = skb_dequeue(&local->skb_queue_unreliable))) { | 336 | (skb = skb_dequeue(&local->skb_queue_unreliable))) { |
338 | switch (skb->pkt_type) { | 337 | switch (skb->pkt_type) { |
339 | case IEEE80211_RX_MSG: | 338 | case IEEE80211_RX_MSG: |
340 | /* status is in skb->cb */ | ||
341 | memcpy(&rx_status, skb->cb, sizeof(rx_status)); | ||
342 | /* Clear skb->pkt_type in order to not confuse kernel | 339 | /* Clear skb->pkt_type in order to not confuse kernel |
343 | * netstack. */ | 340 | * netstack. */ |
344 | skb->pkt_type = 0; | 341 | skb->pkt_type = 0; |
345 | __ieee80211_rx(local_to_hw(local), skb, &rx_status); | 342 | ieee80211_rx(local_to_hw(local), skb); |
346 | break; | 343 | break; |
347 | case IEEE80211_TX_STATUS_MSG: | 344 | case IEEE80211_TX_STATUS_MSG: |
348 | skb->pkt_type = 0; | 345 | skb->pkt_type = 0; |