]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
rt2x00: correct address calc for queue private data
authorAdam Baker <linux@baker-net.org.uk>
Sun, 10 Feb 2008 21:48:19 +0000 (22:48 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Feb 2008 20:37:18 +0000 (15:37 -0500)
When calculating the offset to add to the queue entry base to get the
individual entry's private data area the base address must be treated
as a char * not a struct queue_entry so we can do byte oriented
pointer arithmetic with it.

Signed-off-by: Adam Baker <linux@baker-net.org.uk>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rt2x00/rt2x00queue.c

index fde64ea3f4ef56aaeaa6f70b6b4c5ef677cae452..943afc9067b16147ba709294f89ae78969bd2cb3 100644 (file)
@@ -160,7 +160,8 @@ static int rt2x00queue_alloc_entries(struct data_queue *queue,
                return -ENOMEM;
 
 #define QUEUE_ENTRY_PRIV_OFFSET(__base, __index, __limit, __esize, __psize) \
-       ( (__base) + ((__limit) * (__esize)) + ((__index) * (__psize)) )
+       ( ((char *)(__base)) + ((__limit) * (__esize)) + \
+           ((__index) * (__psize)) )
 
        for (i = 0; i < queue->limit; i++) {
                entries[i].flags = 0;