From patchwork Fri Apr 19 12:44:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Beldan X-Patchwork-Id: 2464951 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 08B6D3FD8C for ; Fri, 19 Apr 2013 12:49:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S968345Ab3DSMtR (ORCPT ); Fri, 19 Apr 2013 08:49:17 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:58649 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S968316Ab3DSMtQ (ORCPT ); Fri, 19 Apr 2013 08:49:16 -0400 Received: by mail-wi0-f176.google.com with SMTP id hj19so757766wib.9 for ; Fri, 19 Apr 2013 05:49:15 -0700 (PDT) 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=vVYD9m4uZRjnfkymikACJ0k7Q0rgJ97LSooyo6z0a4I=; b=r7LZ68In4Z8ozC3wsuRSSOj4UyXSeXgXvPWirlK6y29StvgEjrzn9KA9PD0KUR/R4g 3+Pv1OO+sHDVlOaAtS9YC6GM7fgJegdwJYHrcs+GBri6NSqHNlV7clS59caUIWWFhh8w llIUzOEx2akhZ16oREUiew2i6L+y4yDVCRcg2Wz3tYPyUCU0Lm002d7WSShZ03wHLflK 1gJscMdfEZGqlLvhsc0wWUS7BSjpnwb31KxI15Z0RZNGBkn6oL7in9MfELJJiaBs9Jmg CxWlkv1Vmp6eNyFm1jumlMTDQj+dV9DzNF00QhnSBpv6gIaQ25U5gMeHGPR37usFwDG+ 7TqQ== X-Received: by 10.180.105.195 with SMTP id go3mr7544621wib.2.1366375755491; Fri, 19 Apr 2013 05:49:15 -0700 (PDT) Received: from magnum.frso.rivierawaves.com (vpn.rivierawaves.com. [91.151.119.162]) by mx.google.com with ESMTPSA id n2sm3069654wiy.6.2013.04.19.05.49.13 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Apr 2013 05:49:14 -0700 (PDT) From: Karl Beldan To: Johannes Berg Cc: linux-wireless , Karl Beldan , Karl Beldan , Felix Fietkau Subject: [PATCH] mac80211_hwsim: handle IEEE80211_HW_SUPPORTS_RC_TABLE Date: Fri, 19 Apr 2013 14:44:52 +0200 Message-Id: <1366375492-10979-1-git-send-email-karl.beldan@gmail.com> X-Mailer: git-send-email 1.8.2 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Karl Beldan Signed-off-by: Karl Beldan --- drivers/net/wireless/mac80211_hwsim.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index b5117f5..fd30beb7 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -53,6 +53,10 @@ static bool paged_rx = false; module_param(paged_rx, bool, 0644); MODULE_PARM_DESC(paged_rx, "Use paged SKBs for RX instead of linear ones"); +static bool rctbl = false; +module_param(rctbl, bool, 0444); +MODULE_PARM_DESC(rctbl, "Handle rate control table"); + /** * enum hwsim_regtest - the type of regulatory tests we offer * @@ -887,8 +891,12 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw, if (control->sta) hwsim_check_sta_magic(control->sta); - txi->rate_driver_data[0] = channel; + if (rctbl) + ieee80211_get_tx_rates(txi->control.vif, control->sta, skb, + txi->control.rates, + ARRAY_SIZE(txi->control.rates)); + txi->rate_driver_data[0] = channel; mac80211_hwsim_monitor_rx(hw, skb, channel); /* wmediumd mode check */ @@ -990,6 +998,13 @@ static void mac80211_hwsim_tx_frame(struct ieee80211_hw *hw, { u32 _pid = ACCESS_ONCE(wmediumd_portid); + if (rctbl) { + struct ieee80211_tx_info *txi = IEEE80211_SKB_CB(skb); + ieee80211_get_tx_rates(txi->control.vif, NULL, skb, + txi->control.rates, + ARRAY_SIZE(txi->control.rates)); + } + mac80211_hwsim_monitor_rx(hw, skb, chan); if (_pid) @@ -1020,6 +1035,11 @@ static void mac80211_hwsim_beacon_tx(void *arg, u8 *mac, if (skb == NULL) return; info = IEEE80211_SKB_CB(skb); + if (rctbl) + ieee80211_get_tx_rates(vif, NULL, skb, + info->control.rates, + ARRAY_SIZE(info->control.rates)); + txrate = ieee80211_get_tx_rate(hw, info); mgmt = (struct ieee80211_mgmt *) skb->data; @@ -2277,6 +2297,8 @@ static int __init init_mac80211_hwsim(void) IEEE80211_HW_AMPDU_AGGREGATION | IEEE80211_HW_WANT_MONITOR_VIF | IEEE80211_HW_QUEUE_CONTROL; + if (rctbl) + hw->flags |= IEEE80211_HW_SUPPORTS_RC_TABLE; hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS | WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;