From patchwork Sun Jan 25 03:45:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 432455 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 B254C140161 for ; Sun, 25 Jan 2015 14:46:16 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D653928B413; Sun, 25 Jan 2015 04:43:45 +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 43C8E2800D4 for ; Sun, 25 Jan 2015 04:43:43 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sun, 25 Jan 2015 04:43:42 +0100 (CET) Received: by mail-pd0-f176.google.com with SMTP id y10so5521571pdj.7 for ; Sat, 24 Jan 2015 19:46:02 -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=e0Xh1YT3m6VJOaL55g8ho5Xk6wGyMCXyI16rBtVkFAA=; b=m5iTD8fYr+L1p4XqjAdha7OE76fMXcaJ6ZLfWfkwgnHcha95fDc7PgojzJHrebQM5U mIOm9H9BMPI5Zqb702JAgdNdP+HSZDz08yDG8xio5BQQKZLZe5+ABfWfoxC3FvKGkT7Z 33ZY+uPht/M/NfzzJb6/v1ClMXauz1JFay92/quyOSbMVunUAqqoHp6vyDYu3xyvRrBl Y7V05sySxxPsyTWbaF4UmkPDn5vKKDMVOYROtuhnGrcGjW3rwljcG/pCjDViUq0vKiKo DcP6/2FGIwBlKsOnGhLmIrKMv6S8bmBVtXz0eBJFU7mh5m749yXgyVfSxtktdBCGzPkm dyPA== X-Received: by 10.70.98.200 with SMTP id ek8mr23351448pdb.163.1422157562725; Sat, 24 Jan 2015 19:46:02 -0800 (PST) Received: from haswell.lan (S0106c46e1fb83d53.ss.shawcable.net. [70.76.63.113]) by mx.google.com with ESMTPSA id pm2sm6050741pbb.81.2015.01.24.19.46.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Jan 2015 19:46:02 -0800 (PST) From: Robert Hancock To: openwrt-devel@lists.openwrt.org Date: Sat, 24 Jan 2015 21:45:50 -0600 Message-Id: <1422157550-5766-1-git-send-email-hancockrwd@gmail.com> X-Mailer: git-send-email 2.1.0 Subject: [OpenWrt-Devel] [PATCH] 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, Delayed Block Ack, and 7935-byte AMSDUs. Signed-off-by: Robert Hancock --- .../kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 14 ++++++++++++++ 1 file changed, 14 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..93da360 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -42,6 +42,9 @@ drv_mac80211_init_device_config() { greenfield \ short_gi_20 \ short_gi_40 \ + smps \ + delayed_ba \ + max_amsdu \ dsss_cck_40 } @@ -130,8 +133,11 @@ mac80211_hostapd_setup_base() { greenfield:0 \ short_gi_20:1 \ short_gi_40:1 \ + smps:1 \ tx_stbc:1 \ rx_stbc:3 \ + delayed_ba:1 \ + max_amsdu:1 \ dsss_cck_40:1 ht_cap_mask=0 @@ -139,6 +145,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 +160,14 @@ mac80211_hostapd_setup_base() { RX-STBC1:0x300:0x100:1 \ RX-STBC12:0x300:0x200:1 \ RX-STBC123:0x300:0x300:1 \ + DELAYED-BA:0x400::$delayed_ba \ + 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" }