aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00usb.h
diff options
context:
space:
mode:
authorIvo van Doorn <ivdoorn@gmail.com>2008-05-10 07:46:03 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-05-21 21:47:35 -0400
commitb8be63ffa5dc44324e7f507997870fa3e4b17619 (patch)
treead9ef1c3e4e09111ad93b003baaec325bd5e40e0 /drivers/net/wireless/rt2x00/rt2x00usb.h
parentdec13b6bda600c7e7da993e634562873112af50b (diff)
rt2x00: Merge RX and TX entry private data
With the pending removal of the tx_control structure we can merge the RX and TX entry private data structure in advance. This will temporarily increase the required memory for the queue, but that overhead will only be limited. Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00usb.h')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00usb.h17
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h
index 4da9eb376ebd..15b404aa714d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.h
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.h
@@ -220,30 +220,21 @@ int rt2x00usb_write_tx_data(struct rt2x00_dev *rt2x00dev,
220 struct ieee80211_tx_control *control); 220 struct ieee80211_tx_control *control);
221 221
222/** 222/**
223 * struct queue_entry_priv_usb_rx: Per RX entry USB specific information 223 * struct queue_entry_priv_usb: Per entry USB specific information
224 *
225 * @urb: Urb structure used for device communication.
226 */
227struct queue_entry_priv_usb_rx {
228 struct urb *urb;
229};
230
231/**
232 * struct queue_entry_priv_usb_tx: Per TX entry USB specific information
233 * 224 *
234 * @urb: Urb structure used for device communication. 225 * @urb: Urb structure used for device communication.
235 * @control: mac80211 control structure used to transmit data. 226 * @control: mac80211 control structure used to transmit data.
236 */ 227 */
237struct queue_entry_priv_usb_tx { 228struct queue_entry_priv_usb {
238 struct urb *urb; 229 struct urb *urb;
239 230
240 struct ieee80211_tx_control control; 231 struct ieee80211_tx_control control;
241}; 232};
242 233
243/** 234/**
244 * struct queue_entry_priv_usb_tx: Per TX entry USB specific information 235 * struct queue_entry_priv_usb_bcn: Per TX entry USB specific information
245 * 236 *
246 * The first section should match &struct queue_entry_priv_usb_tx exactly. 237 * The first section should match &struct queue_entry_priv_usb exactly.
247 * rt2500usb can use this structure to send a guardian byte when working 238 * rt2500usb can use this structure to send a guardian byte when working
248 * with beacons. 239 * with beacons.
249 * 240 *