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

Commit 6db3786a authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Move generic TX frame writing code into rt2x00queue 



The write_tx_data functions in rt2x00pci and rt2x00usb have
a lot in common. This moves that duplicate code into
rt2x00queue_write_tx_frame().

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f019d514

drivers/net/wireless/rt2x00/rt2x00.h

+1 −2
Original line number Diff line number Diff line
@@ -546,8 +546,7 @@ struct rt2x00lib_ops { 
	void (*write_tx_desc) (struct rt2x00_dev *rt2x00dev,

			       struct sk_buff *skb,

			       struct txentry_desc *txdesc);

	int (*write_tx_data) (struct rt2x00_dev *rt2x00dev,

			      struct data_queue *queue, struct sk_buff *skb);

	int (*write_tx_data) (struct queue_entry *entry);

	int (*get_tx_data_len) (struct rt2x00_dev *rt2x00dev,

				struct sk_buff *skb);

	void (*kick_tx_queue) (struct rt2x00_dev *rt2x00dev,

drivers/net/wireless/rt2x00/rt2x00lib.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, 
/*

 * Queue handlers.

 */

int rt2x00queue_write_tx_frame(struct data_queue *queue, struct sk_buff *skb);

void rt2x00queue_init_rx(struct rt2x00_dev *rt2x00dev);

void rt2x00queue_init_tx(struct rt2x00_dev *rt2x00dev);

int rt2x00queue_initialize(struct rt2x00_dev *rt2x00dev);

drivers/net/wireless/rt2x00/rt2x00mac.c

+2 −5
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int rt2x00mac_tx_rts_cts(struct rt2x00_dev *rt2x00dev, 
	memset(skbdesc, 0, sizeof(*skbdesc));

	skbdesc->flags |= FRAME_DESC_DRIVER_GENERATED;



	if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, queue, skb)) {

	if (rt2x00queue_write_tx_frame(queue, skb)) {

		WARNING(rt2x00dev, "Failed to send RTS/CTS frame.\n");

		return NETDEV_TX_BUSY;

	}
@@ -158,7 +158,7 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
		}

	}



	if (rt2x00dev->ops->lib->write_tx_data(rt2x00dev, queue, skb)) {

	if (rt2x00queue_write_tx_frame(queue, skb)) {

		ieee80211_stop_queue(rt2x00dev->hw, qid);

		return NETDEV_TX_BUSY;

	}
@@ -166,9 +166,6 @@ int rt2x00mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
	if (rt2x00queue_full(queue))

		ieee80211_stop_queue(rt2x00dev->hw, qid);



	if (rt2x00dev->ops->lib->kick_tx_queue)

		rt2x00dev->ops->lib->kick_tx_queue(rt2x00dev, qid);



	return NETDEV_TX_OK;

}

EXPORT_SYMBOL_GPL(rt2x00mac_tx);

drivers/net/wireless/rt2x00/rt2x00pci.c

+16 −27
Original line number Diff line number Diff line
@@ -34,52 +34,40 @@ 
/*

 * TX data handlers.

 */

int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev,

			    struct data_queue *queue, struct sk_buff *skb)

int rt2x00pci_write_tx_data(struct queue_entry *entry)

{

	struct queue_entry *entry = rt2x00queue_get_entry(queue, Q_INDEX);

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

	struct skb_frame_desc *skbdesc;

	struct txentry_desc txdesc;

	u32 word;



	if (rt2x00queue_full(queue))

		return -EINVAL;



	rt2x00_desc_read(entry_priv->desc, 0, &word);



	if (rt2x00_get_field32(word, TXD_ENTRY_OWNER_NIC) ||

	    rt2x00_get_field32(word, TXD_ENTRY_VALID)) {

		ERROR(rt2x00dev,

		      "Arrived at non-free entry in the non-full queue %d.\n"

	/*

	 * This should not happen, we already checked the entry

	 * was ours. When the hardware disagrees there has been

	 * a queue corruption!

	 */

	if (unlikely(rt2x00_get_field32(word, TXD_ENTRY_OWNER_NIC) ||

		     rt2x00_get_field32(word, TXD_ENTRY_VALID))) {

		ERROR(entry->queue->rt2x00dev,

		      "Corrupt queue %d, accessing entry which is not ours.\n"

		      "Please file bug report to %s.\n",

		      entry->queue->qid, DRV_PROJECT);

		return -EINVAL;

	}



	/*

	 * Copy all TX descriptor information into txdesc,

	 * after that we are free to use the skb->cb array

	 * for our information.

	 */

	entry->skb = skb;

	rt2x00queue_create_tx_descriptor(entry, &txdesc);



	/*

	 * Fill in skb descriptor

	 */

	skbdesc = get_skb_frame_desc(skb);

	skbdesc = get_skb_frame_desc(entry->skb);

	memset(skbdesc, 0, sizeof(*skbdesc));

	skbdesc->data = skb->data;

	skbdesc->data_len = skb->len;

	skbdesc->data = entry->skb->data;

	skbdesc->data_len = entry->skb->len;

	skbdesc->desc = entry_priv->desc;

	skbdesc->desc_len = queue->desc_size;

	skbdesc->desc_len = entry->queue->desc_size;

	skbdesc->entry = entry;



	memcpy(entry_priv->data, skb->data, skb->len);



	rt2x00queue_write_tx_descriptor(entry, &txdesc);

	rt2x00queue_index_inc(queue, Q_INDEX);

	memcpy(entry_priv->data, entry->skb->data, entry->skb->len);



	return 0;

}
@@ -178,6 +166,7 @@ void rt2x00pci_txdone(struct rt2x00_dev *rt2x00dev, struct queue_entry *entry, 
	rt2x00_set_field32(&word, TXD_ENTRY_VALID, 0);

	rt2x00_desc_write(entry_priv->desc, 0, word);



	__clear_bit(ENTRY_OWNER_DEVICE_DATA, &entry->flags);

	rt2x00queue_index_inc(entry->queue, Q_INDEX_DONE);



	/*

drivers/net/wireless/rt2x00/rt2x00pci.h

+7 −4
Original line number Diff line number Diff line
@@ -87,11 +87,14 @@ rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev, 
	memcpy_toio(rt2x00dev->csr.base + offset, value, length);

}



/*

 * TX data handlers.

/**

 * rt2x00pci_write_tx_data - Initialize data for TX operation

 * @entry: The entry where the frame is located

 *

 * This function will initialize the DMA and skb descriptor

 * to prepare the entry for the actual TX operation.

 */

int rt2x00pci_write_tx_data(struct rt2x00_dev *rt2x00dev,

			    struct data_queue *queue, struct sk_buff *skb);

int rt2x00pci_write_tx_data(struct queue_entry *entry);



/**

 * struct queue_entry_priv_pci: Per entry PCI specific information