Re: [RFC] mac80211: handling Qdisc issues

[Michael Buesch <mb@bu3sch.de>]

On Thursday 06 March 2008 17:51:47 Ron Rindjunsky wrote:
> diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
> index 3dfb28a..416a43e 100644
> --- a/drivers/net/wireless/b43/dma.c
> +++ b/drivers/net/wireless/b43/dma.c
> @@ -1294,7 +1294,12 @@ int b43_dma_tx(struct b43_wldev *dev,
>  		hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_MOREDATA);
>  	} else {
>  		/* Decide by priority where to put this frame. */
> -		ring = priority_to_txring(dev, ctl->queue);
> +#ifdef CONFIG_NETDEVICES_MULTIQUEUE
> +		ring = priority_to_txring(dev, skb->queue_mapping);
> +#else
> +		/* XXX: b43 qos needs a lot of work */
> +		ring = 1;
> +#endif
>  	}

ehm, this won't compile.
And did you see the patches I recently submitted?

> diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c
> index e87b427..c8eeb27 100644
> --- a/drivers/net/wireless/b43legacy/dma.c
> +++ b/drivers/net/wireless/b43legacy/dma.c
> @@ -1323,7 +1323,11 @@ int b43legacy_dma_tx(struct b43legacy_wldev *dev,
>  	int err = 0;
>  	unsigned long flags;
>  
> -	ring = priority_to_txring(dev, ctl->queue);
> +#ifdef CONFIG_NETDEVICES_MULTIQUEUE
> +	ring = priority_to_txring(dev, skb->queue_mapping);
> +#else
> +	ring = 1;
> +#endif

Won't compile.


-- 
Greetings Michael.