On Mon, May 26, 2008 at 04:44:59PM +0200, Johannes Berg wrote:
> When I moved the TX info into skb->cb apparently I forgot to change a
> few places to put the p54-internal data into info->driver_data rather
> than skb->cb. This should fix it.
>
> Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> ---
> drivers/net/wireless/p54/p54common.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> --- everything.orig/drivers/net/wireless/p54/p54common.c 2008-05-26 09:42:49.000000000 +0200
> +++ everything/drivers/net/wireless/p54/p54common.c 2008-05-26 09:44:40.000000000 +0200
> @@ -392,16 +392,20 @@ static void p54_rx_frame_sent(struct iee
> u32 last_addr = priv->rx_start;
>
> while (entry != (struct sk_buff *)&priv->tx_queue) {
> - range = (struct memrecord *)&entry->cb;
> + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(entry);
> + range = (void *)info->driver_data;
> if (range->start_addr == addr) {
> - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(entry);
> struct p54_control_hdr *entry_hdr;
> struct p54_tx_control_allocdata *entry_data;
> int pad = 0;
>
> - if (entry->next != (struct sk_buff *)&priv->tx_queue)
> - freed = ((struct memrecord *)&entry->next->cb)->start_addr - last_addr;
> - else
> + if (entry->next != (struct sk_buff *)&priv->tx_queue) {
> + struct ieee80211_tx_info *ni;
> +
> + ni = IEEE80211_SKB_CB(entry->next);
> + freed = ((void *)ni->driver_data)->start_addr
> + - last_addr;
> + } else
> freed = priv->rx_end - last_addr;
>
> last_addr = range->end_addr;
CC [M] drivers/net/wireless/p54/p54common.o
drivers/net/wireless/p54/p54common.c: In function ‘p54_rx_frame_sent’:
drivers/net/wireless/p54/p54common.c:406: warning: dereferencing ‘void *’ pointer
drivers/net/wireless/p54/p54common.c:406: error: request for member ‘start_addr’ in something not a structure or union
Looks like you are missing a (struct memrecord *) for the freed
assignment...?
John
--
John W. Linville
linville@xxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
