p54: p54: refactor p54_rx_frame_sent (9de5776f) · Commits · 戴 / test

drivers/net/wireless/p54/p54common.c

+61 −57

Original line number	Diff line number	Diff line
		@@ -549,12 +549,17 @@ static void p54_rx_frame_sent(struct ieee80211_hw dev, struct sk_buff skb)
		spin_lock_irqsave(&priv->tx_queue.lock, flags);
		while (entry != (struct sk_buff *)&priv->tx_queue) {
		struct ieee80211_tx_info *info = IEEE80211_SKB_CB(entry);
		range = (void *)info->rate_driver_data;
		if (range->start_addr == addr) {
		struct p54_control_hdr *entry_hdr;
		struct p54_tx_control_allocdata *entry_data;
		int pad = 0;

		range = (void *)info->rate_driver_data;
		if (range->start_addr != addr) {
		last_addr = range->end_addr;
		entry = entry->next;
		continue;
		}

		if (entry->next != (struct sk_buff *)&priv->tx_queue) {
		struct ieee80211_tx_info *ni;
		struct memrecord *mr;
		@@ -600,22 +605,21 @@ static void p54_rx_frame_sent(struct ieee80211_hw dev, struct sk_buff skb)

		priv->tx_stats[entry_data->hw_queue].len--;
		if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) &&
		!(payload->status & 0x01))
		(!payload->status))
		info->flags \|= IEEE80211_TX_STAT_ACK;
		if (payload->status & 0x02)
		info->flags \|= IEEE80211_TX_STAT_TX_FILTERED;
		info->status.ack_signal = p54_rssi_to_dbm(dev,
		le16_to_cpu(payload->ack_rssi));
		skb_pull(entry, sizeof(hdr) + pad + sizeof(entry_data));
		ieee80211_tx_status_irqsafe(dev, entry);
		goto out;
		} else
		last_addr = range->end_addr;
		entry = entry->next;
		}
		spin_unlock_irqrestore(&priv->tx_queue.lock, flags);

		out:
		if (freed >= IEEE80211_MAX_RTS_THRESHOLD + 0x170 +
		sizeof(struct p54_control_hdr))
		if (freed >= priv->headroom + sizeof(struct p54_control_hdr) + 48 +
		IEEE80211_MAX_RTS_THRESHOLD + priv->tailroom)
		p54_wake_free_queues(dev);
		}

Admin message