This isn't a behavior problem as is, and fixing indentation
inconsistency either way would be fine (reindent or braces).
Signed-off-by: Ilpo J?rvinen <[email protected]>
---
drivers/net/wireless/ath9k/main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
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;
+ }
}
if (tx_status->flags & ATH_TX_BAR) {
--
1.5.2.2
On Thu, 30 Oct 2008, Johannes Berg wrote:
> On Thu, 2008-10-30 at 13:41 +0200, Ilpo J?rvinen wrote:
> > This isn't a behavior problem as is, and fixing indentation
> > inconsistency either way would be fine (reindent or braces).
> >
> > Signed-off-by: Ilpo J?rvinen <[email protected]>
> > ---
> > drivers/net/wireless/ath9k/main.c | 3 ++-
> > 1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > 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?
Agreed. I had perhaps done too many of these already when I came to this
one and failed to notice such obviousness... :-)
> Also, this code has been removed in a recent change in the wireless
> tree, I think (the rate control revamp)
Ok. A bit hard for me to track all the upcoming changes tree wide, I once
did this kind of things in -next but since it had the break recently I
didn't remember to return to it.
--
i.
On Thu, 2008-10-30 at 13:41 +0200, Ilpo Järvinen wrote:
> This isn't a behavior problem as is, and fixing indentation
> inconsistency either way would be fine (reindent or braces).
>
> Signed-off-by: Ilpo Järvinen <[email protected]>
> ---
> drivers/net/wireless/ath9k/main.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> 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)
johannes