Commit ce6c4a13 authored by Michael Buesch's avatar Michael Buesch Committed by John W. Linville
Browse files

b43: Do not use _irqsafe callbacks



We don't need to call the irqsafe callbacks.

Signed-off-by: default avatarMichael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3dbba8e2
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1428,9 +1428,9 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
				ring->nr_failed_tx_packets++;
			ring->nr_total_packet_tries += status->frame_count;
#endif /* DEBUG */
			ieee80211_tx_status_irqsafe(dev->wl->hw, meta->skb);
			ieee80211_tx_status(dev->wl->hw, meta->skb);

			/* skb is freed by ieee80211_tx_status_irqsafe() */
			/* skb is freed by ieee80211_tx_status() */
			meta->skb = NULL;
		} else {
			/* No need to call free_descriptor_buffer here, as
+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev,
	q->buffer_used -= total_len;
	q->free_packet_slots += 1;

	ieee80211_tx_status_irqsafe(dev->wl->hw, pack->skb);
	ieee80211_tx_status(dev->wl->hw, pack->skb);
	pack->skb = NULL;
	list_add(&pack->list, &q->packets_list);

+1 −1
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
	}

	memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
	ieee80211_rx_irqsafe(dev->wl->hw, skb);
	ieee80211_rx(dev->wl->hw, skb);

	return;
drop: