rt2x00: rt2800usb: use rt2x00dev->rx->limit
authorGabor Juhos <juhosg@openwrt.org>
Wed, 1 May 2013 15:17:32 +0000 (17:17 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 May 2013 19:05:31 +0000 (15:05 -0400)
The RX data queue is initialized already when
the rt2800_usb_enable_radio() function is called.

Fetch the number of the queue entries from that
instead of using the entry_num field of the data
queue descriptor.

The two values are the same, and the use of the
rt2x00dev->rx->limit value allows us to get rid
of a superfluous pointer dereference.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rt2x00/rt2800usb.c

index ac854d75bd6cb33bd32f86e199b10e57b775d3ce..c71a48da9a315b81938471b1d6090be9b2571fef 100644 (file)
@@ -327,7 +327,7 @@ static int rt2800usb_enable_radio(struct rt2x00_dev *rt2x00dev)
         * this limit so reduce the number to prevent errors.
         */
        rt2x00_set_field32(&reg, USB_DMA_CFG_RX_BULK_AGG_LIMIT,
-                          ((rt2x00dev->ops->rx->entry_num * DATA_FRAME_SIZE)
+                          ((rt2x00dev->rx->limit * DATA_FRAME_SIZE)
                            / 1024) - 3);
        rt2x00_set_field32(&reg, USB_DMA_CFG_RX_BULK_EN, 1);
        rt2x00_set_field32(&reg, USB_DMA_CFG_TX_BULK_EN, 1);