From patchwork Sat Jan 31 05:21:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Hancock X-Patchwork-Id: 435100 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 9FE0D1402B3 for ; Sat, 31 Jan 2015 16:21:57 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 4A9B12806AE; Sat, 31 Jan 2015 06:19:16 +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 1884D280403 for ; Sat, 31 Jan 2015 06:19:11 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-pa0-f46.google.com (mail-pa0-f46.google.com [209.85.220.46]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Sat, 31 Jan 2015 06:19:10 +0100 (CET) Received: by mail-pa0-f46.google.com with SMTP id lj1so60322957pab.5 for ; Fri, 30 Jan 2015 21:21:37 -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=rNspdUB87zVjVhvJ6Aff1ahpC+7gko4CG8C9DQUBN0s=; b=hiNXZvut3WmuSKCovBAd2at/+f5mF3/q2xOrlTM433Vgpxf1toq0a7C7MX9to+OYoc De8LQHAg0nEexXVZYKYNxHmi0zyP4IwLb3VNGl1cKnkdeE7ls/tNMheWlXqx9Eo8mWtM Z+HZtA2Jy6qmSdmf/+d2yDt2o0QQG9HyCQyH4RjaWeqc4AG1gyDdWyGgyZuvhmckaXlb NOV6wrlPaLED2FpjyhNniYNg2Hg2RbyP9O2zuy8KMwumjiBmiUymOMrD1m13qu3N24vc dfrJ2MEvPqGgBVGokd3L34qGZz6HcD0wIa5peX+RHz9l1ePvg8SCu6AslfFi3rr24O6H Ip+w== X-Received: by 10.66.66.40 with SMTP id c8mr13806447pat.139.1422681697413; Fri, 30 Jan 2015 21:21:37 -0800 (PST) Received: from haswell.lan (S0106c46e1fb83d53.ss.shawcable.net. [70.76.63.113]) by mx.google.com with ESMTPSA id b15sm9738003pbu.24.2015.01.30.21.21.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jan 2015 21:21:36 -0800 (PST) From: Robert Hancock To: openwrt-devel@lists.openwrt.org Date: Fri, 30 Jan 2015 23:21:21 -0600 Message-Id: <1422681681-32395-1-git-send-email-hancockrwd@gmail.com> X-Mailer: git-send-email 2.1.0 Cc: Robert Hancock Subject: [OpenWrt-Devel] [PATCH] mac80211: Revert adding SM Power Save capability 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" Part of rev 44173 added setting the SM Power Save capability in the hostapd.conf file if the driver indicated that it was supported. It appears this was incorrect, because the field in the actual HT Capabilities field in the AP configuration is really a state indication. Just copying the state from the capability resulted in the AP indicating that it had SMPS enabled all the time if it supported SMPS. This effectively just disables all clients from sending packets to the AP with more than one spatial stream, for no good reason. So remove this part of the change. Signed-off-by: Robert Hancock --- package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 72f9936..9526300 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -42,7 +42,6 @@ drv_mac80211_init_device_config() { greenfield \ short_gi_20 \ short_gi_40 \ - smps \ max_amsdu \ dsss_cck_40 } @@ -132,7 +131,6 @@ 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 \ @@ -143,8 +141,6 @@ 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) ))" @@ -161,10 +157,6 @@ mac80211_hostapd_setup_base() { 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" }