Return-Path: From: Jonghwan Choi To: 'Jonghwan Choi' , linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, 'Stanislaw Gruszka' , "'John W. Linville'" , cpgs@samsung.com References: In-reply-to: Subject: [PATCH 3.9-stable] iwlegacy: fix rate control regression Date: Fri, 28 Jun 2013 08:43:46 +0900 Message-id: <002401ce7390$2aebe2b0$80c3a810$%choi@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit Content-language: ko Sender: linux-kernel-owner@vger.kernel.org List-ID: This patch looks like it should be in the 3.9-stable tree, should we apply it? ------------------ From: "Stanislaw Gruszka " commit a8cf0194b7187fb65dfff28a1c5153d442e3836a upstream Since driver does not use control.rates[0].count, we have never set that variable. But currently, after rate control API rewrite, this is required by mac80211. Otherwise legacy rates control does not work and we transmit always at 1Mbit/s on pre 11n networks. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville Signed-off-by: Jonghwan Choi --- drivers/net/wireless/iwlegacy/3945-rs.c | 1 + drivers/net/wireless/iwlegacy/4965-rs.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/iwlegacy/3945-rs.c b/drivers/net/wireless/iwlegacy/3945-rs.c index d4fd29a..dde7ff0 100644 --- a/drivers/net/wireless/iwlegacy/3945-rs.c +++ b/drivers/net/wireless/iwlegacy/3945-rs.c @@ -816,6 +816,7 @@ out: rs_sta->last_txrate_idx = idx; info->control.rates[0].idx = rs_sta->last_txrate_idx; } + info->control.rates[0].count = 1; D_RATE("leave: %d\n", idx); } diff --git a/drivers/net/wireless/iwlegacy/4965-rs.c b/drivers/net/wireless/iwlegacy/4965-rs.c index 6c7493c..38fb9e1 100644 --- a/drivers/net/wireless/iwlegacy/4965-rs.c +++ b/drivers/net/wireless/iwlegacy/4965-rs.c @@ -2268,7 +2268,7 @@ il4965_rs_get_rate(void *il_r, struct ieee80211_sta *sta, void *il_sta, info->control.rates[0].flags = 0; } info->control.rates[0].idx = rate_idx; - + info->control.rates[0].count = 1; } static void * -- 1.7.9.5