From patchwork Sun Jan 25 18:24:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 432590 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6E1C21401DC for ; Mon, 26 Jan 2015 05:24:45 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 7625328BE49; Sun, 25 Jan 2015 19:22:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: * X-Spam-Status: No, score=1.3 required=5.0 tests=BAYES_00,FREEMAIL_FROM, HK_RANDOM_ENVFROM, HK_RANDOM_FROM, T_DKIM_INVALID autolearn=no version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A53F828BE1A for ; Sun, 25 Jan 2015 19:22:12 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-pd0-f175.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2 RANDOM_SENDER=0.25; rate: -8.25 Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com [209.85.192.175]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 25 Jan 2015 19:22:11 +0100 (CET) Received: by mail-pd0-f175.google.com with SMTP id fl12so7774051pdb.6 for ; Sun, 25 Jan 2015 10:24:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=jxIv44YbeSbsN7oWpZyVtdDQZd5Hw1AUW2J4XJ35fy0=; b=IcTIyKlNBxyDGnOiJma2sKqE2TnZLrJt5DL2LNo7Cbx4+TViMW1wG8kTYi/Wc3ZSL+ 2zd7eF0PFj9at6RARg5mzaoWuay+DkWzB5qdt0IuUkA8wNpWCOkZyDJ7lFdlsLJntQYE eKV1Y0vxYSn58H4tGxo20SUgbEhZzfGPnOilAeQyUF+8osyh9MOYoGdgAcqLwqXOEVXg 43WpBuGSQ4QoCjw+54UMpCfv2bhFJTJp7g+0Q7OzSGPVcxIXGfSssMmNJrEoD/IxSmP9 D5G8HemDU14Mux4GyEamMtT4zKjZDGH2XTfgI1QFuTvjUtPFxswPwde1MqqJNKssm5PJ 17Kg== X-Received: by 10.68.235.74 with SMTP id uk10mr28339142pbc.33.1422210273789; Sun, 25 Jan 2015 10:24:33 -0800 (PST) Received: from haswell.lan (S0106c46e1fb83d53.ss.shawcable.net. [70.76.63.113]) by mx.google.com with ESMTPSA id sl5sm7774770pbc.45.2015.01.25.10.24.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jan 2015 10:24:33 -0800 (PST) From: Robert Hancock To: openwrt-devel@lists.openwrt.org Date: Sun, 25 Jan 2015 12:24:03 -0600 Message-Id: <1422210243-14079-1-git-send-email-hancockrwd@gmail.com> X-Mailer: git-send-email 2.1.0 Subject: [OpenWrt-Devel] [PATCH v2] mac80211: Add some missing 802.11n capabilities to hostapd configuration X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Add some missing 802.11n capabilities to the hostapd ht_capab string when supported by the hardware: Spatial Multiplexing Power-Save and 7935-byte AMSDUs. Signed-off-by: Robert Hancock --- package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 1a85d15..72f9936 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -42,6 +42,8 @@ drv_mac80211_init_device_config() { greenfield \ short_gi_20 \ short_gi_40 \ + smps \ + max_amsdu \ dsss_cck_40 } @@ -130,8 +132,10 @@ mac80211_hostapd_setup_base() { greenfield:0 \ short_gi_20:1 \ short_gi_40:1 \ + smps:1 \ tx_stbc:1 \ rx_stbc:3 \ + max_amsdu:1 \ dsss_cck_40:1 ht_cap_mask=0 @@ -139,6 +143,8 @@ mac80211_hostapd_setup_base() { ht_cap_mask="$(($ht_cap_mask | $cap))" done + cap_smps=$((($ht_cap_mask >> 2) & 3)) + cap_rx_stbc=$((($ht_cap_mask >> 8) & 3)) [ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc" ht_cap_mask="$(( ($ht_cap_mask & ~(0x300)) | ($cap_rx_stbc << 8) ))" @@ -152,8 +158,13 @@ mac80211_hostapd_setup_base() { RX-STBC1:0x300:0x100:1 \ RX-STBC12:0x300:0x200:1 \ RX-STBC123:0x300:0x300:1 \ + MAX-AMSDU-7935:0x800::$max_amsdu \ DSSS_CCK-40:0x1000::$dsss_cck_40 + # SM Power Save: 0=static, 1=dynamic, 3=disabled + [ "$smps" = 1 -a "$cap_smps" = 0 ] && ht_capab_flags="$ht_capab_flags[SMPS-STATIC]" + [ "$smps" = 1 -a "$cap_smps" = 1 ] && ht_capab_flags="$ht_capab_flags[SMPS-DYNAMIC]" + ht_capab="$ht_capab$ht_capab_flags" [ -n "$ht_capab" ] && append base_cfg "ht_capab=$ht_capab" "$N" }