> > --- everything.orig/net/mac80211/tx.c 2008-05-15 12:09:40.000000000 +0200 > > +++ everything/net/mac80211/tx.c 2008-05-15 12:09:59.000000000 +0200 > > > @@ -1325,9 +1324,10 @@ int ieee80211_master_start_xmit(struct s > > dev_kfree_skb(skb); > > return 0; > > } > > + > > osdata = IEEE80211_DEV_TO_SUB_IF(odev); > > > > - encrypt = !(pkt_data->flags & IEEE80211_TXPD_DO_NOT_ENCRYPT); > > + encrypt = !(info->flags & IEEE80211_TX_CTL_DO_NOT_ENCRYPT); > > > > headroom = osdata->local->tx_headroom; > > if (encrypt) > > This hunk didn't apply, please review the merge results. That's because I forgot to send you a patch: "mac80211: clean up skb reallocation code"... Sorry about that, I'll rebase it and send it to you now. johannes
Attachment:
signature.asc
Description: This is a digitally signed message part
