diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-15 14:31:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-15 14:31:06 -0700 |
| commit | 3eb14b944f2b5b6efe4e0ae3fe9601db78437d57 (patch) | |
| tree | bea3d9ce130de0a73504ab94882115004b826fd6 /drivers/net/wireless/ath/ath9k/hif_usb.h | |
| parent | 791f58c0640f906d3f63518d3f02630dbbafb7a2 (diff) | |
| parent | 5c01d5669356e13f0fb468944c1dd4c6a7e978ad (diff) | |
| download | linux-3eb14b944f2b5b6efe4e0ae3fe9601db78437d57.tar.bz2 | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/hif_usb.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/hif_usb.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h index 7cc3762a6789..7d49a8af420e 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.h +++ b/drivers/net/wireless/ath/ath9k/hif_usb.h @@ -34,6 +34,7 @@ #define MAX_RX_URB_NUM 8 #define MAX_RX_BUF_SIZE 16384 +#define MAX_PKT_NUM_IN_TRANSFER 10 #define MAX_REG_OUT_URB_NUM 1 #define MAX_REG_OUT_BUF_NUM 8 @@ -85,18 +86,17 @@ struct hif_device_usb { struct usb_interface *interface; const struct firmware *firmware; struct htc_target *htc_handle; - u8 flags; - struct hif_usb_tx tx; - - struct urb *wlan_rx_data_urb[MAX_RX_URB_NUM]; struct urb *reg_in_urb; - + struct usb_anchor regout_submitted; + struct usb_anchor rx_submitted; struct sk_buff *remain_skb; int rx_remain_len; int rx_pkt_len; int rx_transfer_len; int rx_pad_len; + spinlock_t rx_lock; + u8 flags; /* HIF_USB_* */ }; int ath9k_hif_usb_init(void); |