On Thu, 2008-10-30 at 19:59 +0530, Sujith wrote: > Johannes Berg wrote: > > > diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c > > > index f05f584..0f67b1b 100644 > > > --- a/drivers/net/wireless/ath9k/main.c > > > +++ b/drivers/net/wireless/ath9k/main.c > > > @@ -467,9 +467,10 @@ void ath_tx_complete(struct ath_softc *sc, struct sk_buff *skb, > > > if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK || > > > tx_info->flags & IEEE80211_TX_STAT_TX_FILTERED) { > > > /* free driver's private data area of tx_info */ > > > - if (tx_info->driver_data[0] != NULL) > > > + if (tx_info->driver_data[0] != NULL) { > > > kfree(tx_info->driver_data[0]); > > > tx_info->driver_data[0] = NULL; > > > + } > > > > Since kfree(NULL) is fine, how about just removing the if? Also, this > > code has been removed in a recent change in the wireless tree, I think > > (the rate control revamp) > > > > Rate control hasn't been revamped yet. :) Well, Felix's and my patch touched this code but did actually leave the indentation strange like that. Anyway, since it will be rewritten eventually and the strange indentation doesn't hurt right now, I think not touching it will be simpler to avoid merge conflicts all around. johannes
Attachment:
signature.asc
Description: This is a digitally signed message part