From patchwork Wed Feb 27 12:00:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 2193061 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 533033FD4E for ; Wed, 27 Feb 2013 12:03:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759785Ab3B0MC7 (ORCPT ); Wed, 27 Feb 2013 07:02:59 -0500 Received: from mail-wi0-f174.google.com ([209.85.212.174]:51414 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757414Ab3B0MC7 (ORCPT ); Wed, 27 Feb 2013 07:02:59 -0500 Received: by mail-wi0-f174.google.com with SMTP id hi8so6137300wib.7 for ; Wed, 27 Feb 2013 04:02:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=JH21vjT8ddjaLTUYn6rqb20MofSZHSSF4I2Ns7rOVb4=; b=EpkV9lqRDnPCtJ2k9SyKmo74RD0nEIoXAjPidIbQesFxOkblLdrn5dCboIcKhIH/3l DF1YuO0Xy3elLq23ViPKYdKysOuaDeNZrR8E6Dd5OsJiqZM8G5n9URBJge0YTFIgwXUj Rvolfu0CjSf0fIdShUR56Np0F5Ee5s1V86gUBi+yDKL9TvTGWYJoLsvQNcWcosShvyMS lKtHYSs6xNVaXL/6rRm/o48mnRcQ5Q1f7Nq2URsaVzyQ+OTHdfj/+KFfh/WHHoOxYMg1 VlyN3yWDfb1ClujsYbb2H9ID8V4H6RkUSxS0QJ5ihbIJSaAUfTdU9JCK+zLrKTC1AamF bBMg== X-Received: by 10.180.77.9 with SMTP id o9mr25940722wiw.16.1361966577928; Wed, 27 Feb 2013 04:02:57 -0800 (PST) Received: from magnum.frso.rivierawaves.com (vpn.rivierawaves.com. [91.151.119.162]) by mx.google.com with ESMTPS id cf8sm8269378wib.1.2013.02.27.04.02.56 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 27 Feb 2013 04:02:57 -0800 (PST) From: Karl Beldan To: Johannes Berg Cc: linux-wireless , Karl Beldan , Karl Beldan Subject: [PATCH 1/2] mac80211: get the rates masks from the txrc in rate_control_get_rate Date: Wed, 27 Feb 2013 13:00:33 +0100 Message-Id: <1361966434-28343-1-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 1.7.10.GIT Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Karl Beldan Currently it gets it from the sdata, the behavior remains unchanged. Signed-off-by: Karl Beldan --- net/mac80211/rate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index dd88381..cfbd7d5 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -459,9 +459,8 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata, * default mask (allow all rates) is used to save some processing for * the common case. */ - mask = sdata->rc_rateidx_mask[info->band]; - memcpy(mcs_mask, sdata->rc_rateidx_mcs_mask[info->band], - sizeof(mcs_mask)); + mask = txrc->rate_idx_mask; + memcpy(mcs_mask, txrc->rate_idx_mcs_mask, sizeof(mcs_mask)); if (mask != (1 << txrc->sband->n_bitrates) - 1) { if (sta) { /* Filter out rates that the STA does not support */