rt2800usb: add RXINFO_DESC_SIZE definition

Add RXINFO_DESC_SIZE definition and use it instead of abusing
RXD_DESC_SIZE one (TXD_DESC_SIZE and RXD_DESC_SIZE are specific
to PCI version of the chipset).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index a3e505034fcee2de3645db19c2ac269bf09a71b1..0851dc672a8c9205f1567746e093e61d927ad3af 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -2152,7 +2152,7 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,
         */
        memcpy(skbdesc->desc, rxd, skbdesc->desc_len);
        rxd = (__le32 *)skbdesc->desc;
-       rxwi = &rxd[RXD_DESC_SIZE / sizeof(__le32)];
+       rxwi = &rxd[RXINFO_DESC_SIZE / sizeof(__le32)];
 
        /*
         * It is now safe to read the descriptor on all architectures.
@@ -2874,7 +2874,7 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {
 static const struct data_queue_desc rt2800usb_queue_rx = {
        .entry_num              = RX_ENTRIES,
        .data_size              = AGGREGATION_SIZE,
-       .desc_size              = RXD_DESC_SIZE + RXWI_DESC_SIZE,
+       .desc_size              = RXINFO_DESC_SIZE + RXWI_DESC_SIZE,
        .priv_size              = sizeof(struct queue_entry_priv_usb),
 };
 

diff --git a/drivers/net/wireless/rt2x00/rt2800usb.h b/drivers/net/wireless/rt2x00/rt2800usb.h
index 7b1130a22c55259d115272f905fbea28edf683c4..9d7bb54999cc4492dc2e5449b5d82ae7081568f1 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800usb.h
+++ b/drivers/net/wireless/rt2x00/rt2800usb.h
@@ -1747,7 +1747,8 @@ struct mac_iveiv_entry {
 #define TXD_DESC_SIZE                  ( 4 * sizeof(__le32) )
 #define TXINFO_DESC_SIZE               ( 1 * sizeof(__le32) )
 #define TXWI_DESC_SIZE                 ( 4 * sizeof(__le32) )
-#define RXD_DESC_SIZE                  ( 1 * sizeof(__le32) )
+#define RXD_DESC_SIZE                  ( 4 * sizeof(__le32) )
+#define RXINFO_DESC_SIZE               ( 1 * sizeof(__le32) )
 #define RXWI_DESC_SIZE                 ( 4 * sizeof(__le32) )
 
 /*