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

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

rt2x00: Simplify Queue function arguments 



A lot of functions accept a struct rt2x00_dev combined with
either a struct queue_entry or struct data_queue argument.
This can be simplified by only passing on the queue/entry
argument.

In cases where rt2x00_dev and a sk_buff are send together,
we can send the queue_entry instead.

rt2x00usb_alloc_urb and rt2x00usb_free_urb have a bit
of vague naming. Instead they allocate all the data which
belongs to a rt2x00 data queue entry.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a9325199

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ static void rt2400pci_write_beacon(struct queue_entry *entry, 
	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);



	rt2x00queue_map_txskb(rt2x00dev, entry->skb);

	rt2x00queue_map_txskb(entry);



	/*

	 * Write the TX descriptor for the beacon.

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −1
Original line number Diff line number Diff line
@@ -1258,7 +1258,7 @@ static void rt2500pci_write_beacon(struct queue_entry *entry, 
	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);



	rt2x00queue_map_txskb(rt2x00dev, entry->skb);

	rt2x00queue_map_txskb(entry);



	/*

	 * Write the TX descriptor for the beacon.

drivers/net/wireless/rt2x00/rt2x00.h

+5 −8
Original line number Diff line number Diff line
@@ -1036,17 +1036,15 @@ static inline bool rt2x00_is_soc(struct rt2x00_dev *rt2x00dev) 


/**

 * rt2x00queue_map_txskb - Map a skb into DMA for TX purposes.

 * @rt2x00dev: Pointer to &struct rt2x00_dev.

 * @skb: The skb to map.

 * @entry: Pointer to &struct queue_entry

 */

void rt2x00queue_map_txskb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb);

void rt2x00queue_map_txskb(struct queue_entry *entry);



/**

 * rt2x00queue_unmap_skb - Unmap a skb from DMA.

 * @rt2x00dev: Pointer to &struct rt2x00_dev.

 * @skb: The skb to unmap.

 * @entry: Pointer to &struct queue_entry

 */

void rt2x00queue_unmap_skb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb);

void rt2x00queue_unmap_skb(struct queue_entry *entry);



/**

 * rt2x00queue_get_queue - Convert queue index to queue pointer
@@ -1093,8 +1091,7 @@ void rt2x00lib_dmadone(struct queue_entry *entry); 
void rt2x00lib_txdone(struct queue_entry *entry,

		      struct txdone_entry_desc *txdesc);

void rt2x00lib_txdone_noinfo(struct queue_entry *entry, u32 status);

void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,

		      struct queue_entry *entry);

void rt2x00lib_rxdone(struct queue_entry *entry);



/*

 * mac80211 handlers.

drivers/net/wireless/rt2x00/rt2x00dev.c

+5 −5
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ void rt2x00lib_txdone(struct queue_entry *entry, 
	/*

	 * Unmap the skb.

	 */

	rt2x00queue_unmap_skb(rt2x00dev, entry->skb);

	rt2x00queue_unmap_skb(entry);



	/*

	 * Remove the extra tx headroom from the skb.
@@ -465,9 +465,9 @@ static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev, 
	return 0;

}



void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev,

		      struct queue_entry *entry)

void rt2x00lib_rxdone(struct queue_entry *entry)

{

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

	struct rxdone_entry_desc rxdesc;

	struct sk_buff *skb;

	struct ieee80211_rx_status *rx_status;
@@ -481,14 +481,14 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev, 
	 * Allocate a new sk_buffer. If no new buffer available, drop the

	 * received frame and reuse the existing buffer.

	 */

	skb = rt2x00queue_alloc_rxskb(rt2x00dev, entry);

	skb = rt2x00queue_alloc_rxskb(entry);

	if (!skb)

		return;



	/*

	 * Unmap the skb.

	 */

	rt2x00queue_unmap_skb(rt2x00dev, entry->skb);

	rt2x00queue_unmap_skb(entry);



	/*

	 * Extract the RXD details.

drivers/net/wireless/rt2x00/rt2x00lib.h

+4 −7
Original line number Diff line number Diff line
@@ -100,18 +100,15 @@ void rt2x00lib_config(struct rt2x00_dev *rt2x00dev, 


/**

 * rt2x00queue_alloc_rxskb - allocate a skb for RX purposes.

 * @rt2x00dev: Pointer to &struct rt2x00_dev.

 * @queue: The queue for which the skb will be applicable.

 * @entry: The entry for which the skb will be applicable.

 */

struct sk_buff *rt2x00queue_alloc_rxskb(struct rt2x00_dev *rt2x00dev,

					struct queue_entry *entry);

struct sk_buff *rt2x00queue_alloc_rxskb(struct queue_entry *entry);



/**

 * rt2x00queue_free_skb - free a skb

 * @rt2x00dev: Pointer to &struct rt2x00_dev.

 * @skb: The skb to free.

 * @entry: The entry for which the skb will be applicable.

 */

void rt2x00queue_free_skb(struct rt2x00_dev *rt2x00dev, struct sk_buff *skb);

void rt2x00queue_free_skb(struct queue_entry *entry);



/**

 * rt2x00queue_align_frame - Align 802.11 frame to 4-byte boundary