Re: 015-mac80211-tx-info-skb-cb.patch

[Ivo van Doorn <ivdoorn@gmail.com>]

On Thursday 08 May 2008, Johannes Berg wrote:
> On Thu, 2008-05-08 at 15:03 +0200, Ivo van Doorn wrote:
> > Hi Johannes,
> > 
> > The following patch is intended to be ontop or integrated into your patch:
> > http://johannes.sipsolutions.net/patches/kernel/all/LATEST/015-mac80211-tx-info-skb-cb.patch
> > This fixes a compilation error when mac80211 debug output is disabled.
> > 
> > Ivo
> > ---
> > diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
> > index 3b3592f..50edc9d 100644
> > --- a/net/mac80211/tx.c
> > +++ b/net/mac80211/tx.c
> > @@ -223,10 +223,9 @@ static ieee80211_tx_result
> >  ieee80211_tx_h_check_assoc(struct ieee80211_tx_data *tx)
> >  {
> >  #ifdef CONFIG_MAC80211_VERBOSE_DEBUG
> > -	struct sk_buff *skb = tx->skb;
> > -	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
> > +	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data;
> >  #endif /* CONFIG_MAC80211_VERBOSE_DEBUG */
> > -	struct ieee80211_tx_info *info = (void *)skb->cb;
> > +	struct ieee80211_tx_info *info = (void *)tx->skb->cb;
> 
> Did you send me that before? I seem to have a similar fix already.

No I haven't, I had been compiling mac80211 with VERBOSE_DEBUG on ever
since I added the patches from your tree to rt2x00.git so I never noticed this
bug. I just received the bugreport from somebody at the rt2x00 forum. :)

Since rt2x00.git contains your patches from a week ago, I did check if the
bug was still present in your latest version.
Anyway the important thing is that you have the fix. ;)

Ivo