The following commit has been merged in the linux branch: commit e55ea2b152569f09ef6bb28d5a341a4e5a21f5ce Author: Luis R. Rodriguez lrodriguez@atheros.com Date: Wed Oct 28 20:19:06 2009 -0400
ath9k: fix misplaced semicolon on rate control
The patch e43419f9:
ath9k: downgrade assert in rc.c for invalid rate
downgraded an ASSERT to a WARN_ON() but also misplaced a semicolon at the end of the second check. What this did was force the rate control code to always return the rate even if we should have warned about it. Since this should not have happened anymore anyway this fix isn't critical as the proper rate would have been returned anyway.
Cc: stable@kernel.org Reported-by: Jiri Slaby jirislaby@gmail.com Signed-off-by: Luis R. Rodriguez lrodriguez@atheros.com Signed-off-by: John W. Linville linville@tuxdriver.com
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c index 16a2717..1895d63 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c @@ -679,7 +679,7 @@ static u8 ath_rc_get_highest_rix(struct ath_softc *sc, return rate;
if (rate_table->info[rate].valid_single_stream && - !(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG)); + !(ath_rc_priv->ht_cap & WLAN_RC_DS_FLAG)) return rate;
/* This should not happen */