Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e513a0b6 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Move common txdone handling to rt2x00lib_txdone. 



Now that the write_tx_data functions are merged, also merge the relevant
parts of the txdone handling into common code, rather than {usb,pci}
specific code.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 78eea11b

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1229,7 +1229,7 @@ static void rt2400pci_txdone(struct rt2x00_dev *rt2x00dev, 
		}

		txdesc.retry = rt2x00_get_field32(word, TXD_W0_RETRY_COUNT);



		rt2x00pci_txdone(entry, &txdesc);

		rt2x00lib_txdone(entry, &txdesc);

	}

}

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1365,7 +1365,7 @@ static void rt2500pci_txdone(struct rt2x00_dev *rt2x00dev, 
		}

		txdesc.retry = rt2x00_get_field32(word, TXD_W0_RETRY_COUNT);



		rt2x00pci_txdone(entry, &txdesc);

		rt2x00lib_txdone(entry, &txdesc);

	}

}

drivers/net/wireless/rt2x00/rt2800pci.c

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ static void rt2800pci_txdone(struct rt2x00_dev *rt2x00dev) 
		if (txdesc.retry)

			__set_bit(TXDONE_FALLBACK, &txdesc.flags);



		rt2x00pci_txdone(entry, &txdesc);

		rt2x00lib_txdone(entry, &txdesc);

	}

}

drivers/net/wireless/rt2x00/rt2x00dev.c

+15 −0
Original line number Diff line number Diff line
@@ -210,6 +210,21 @@ void rt2x00lib_txdone(struct queue_entry *entry, 
	unsigned int i;

	bool success;



	/*

	 * Unmap the skb.

	 */

	rt2x00queue_unmap_skb(rt2x00dev, entry->skb);



	/*

	 * Remove the extra tx headroom from the skb.

	 */

	skb_pull(entry->skb, rt2x00dev->ops->extra_tx_headroom);



	/*

	 * Signal that the TX descriptor is no longer in the skb.

	 */

	skbdesc->flags &= ~SKBDESC_DESC_IN_SKB;



	/*

	 * Remove L2 padding which was added during

	 */

drivers/net/wireless/rt2x00/rt2x00pci.c

+0 −31
Original line number Diff line number Diff line
@@ -60,37 +60,6 @@ int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev, 
}

EXPORT_SYMBOL_GPL(rt2x00pci_regbusy_read);



/*

 * TX/RX data handlers.

 */

void rt2x00pci_txdone(struct queue_entry *entry,

		      struct txdone_entry_desc *txdesc)

{

	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);



	/*

	 * Unmap the skb.

	 */

	rt2x00queue_unmap_skb(rt2x00dev, entry->skb);



	/*

	 * Remove the extra tx headroom from the skb.

	 */

	skb_pull(entry->skb, rt2x00dev->ops->extra_tx_headroom);



	/*

	 * Signal that the TX descriptor is no longer in the skb.

	 */

	skbdesc->flags &= ~SKBDESC_DESC_IN_SKB;



	/*

	 * Pass on to rt2x00lib.

	 */

	rt2x00lib_txdone(entry, txdesc);

}

EXPORT_SYMBOL_GPL(rt2x00pci_txdone);



void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev)

{

	struct data_queue *queue = rt2x00dev->rx;