diff options
-rw-r--r-- | drivers/net/wireless/b43/dma.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/b43/pio.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/b43/xmit.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index a467ee260a19..8701034569fa 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c | |||
@@ -1428,9 +1428,9 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev, | |||
1428 | ring->nr_failed_tx_packets++; | 1428 | ring->nr_failed_tx_packets++; |
1429 | ring->nr_total_packet_tries += status->frame_count; | 1429 | ring->nr_total_packet_tries += status->frame_count; |
1430 | #endif /* DEBUG */ | 1430 | #endif /* DEBUG */ |
1431 | ieee80211_tx_status_irqsafe(dev->wl->hw, meta->skb); | 1431 | ieee80211_tx_status(dev->wl->hw, meta->skb); |
1432 | 1432 | ||
1433 | /* skb is freed by ieee80211_tx_status_irqsafe() */ | 1433 | /* skb is freed by ieee80211_tx_status() */ |
1434 | meta->skb = NULL; | 1434 | meta->skb = NULL; |
1435 | } else { | 1435 | } else { |
1436 | /* No need to call free_descriptor_buffer here, as | 1436 | /* No need to call free_descriptor_buffer here, as |
diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c index 3498b68385e7..e96091b31499 100644 --- a/drivers/net/wireless/b43/pio.c +++ b/drivers/net/wireless/b43/pio.c | |||
@@ -574,7 +574,7 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev, | |||
574 | q->buffer_used -= total_len; | 574 | q->buffer_used -= total_len; |
575 | q->free_packet_slots += 1; | 575 | q->free_packet_slots += 1; |
576 | 576 | ||
577 | ieee80211_tx_status_irqsafe(dev->wl->hw, pack->skb); | 577 | ieee80211_tx_status(dev->wl->hw, pack->skb); |
578 | pack->skb = NULL; | 578 | pack->skb = NULL; |
579 | list_add(&pack->list, &q->packets_list); | 579 | list_add(&pack->list, &q->packets_list); |
580 | 580 | ||
diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c index 14f541248b5c..c403c616d3bd 100644 --- a/drivers/net/wireless/b43/xmit.c +++ b/drivers/net/wireless/b43/xmit.c | |||
@@ -690,7 +690,7 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr) | |||
690 | } | 690 | } |
691 | 691 | ||
692 | memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status)); | 692 | memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status)); |
693 | ieee80211_rx_irqsafe(dev->wl->hw, skb); | 693 | ieee80211_rx(dev->wl->hw, skb); |
694 | 694 | ||
695 | return; | 695 | return; |
696 | drop: | 696 | drop: |