From patchwork Wed Mar 2 09:46:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 602431 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p229md1T003932 for ; Wed, 2 Mar 2011 09:48:39 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756374Ab1CBJse (ORCPT ); Wed, 2 Mar 2011 04:48:34 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:38871 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756315Ab1CBJsd (ORCPT ); Wed, 2 Mar 2011 04:48:33 -0500 Received: by bwz15 with SMTP id 15so5409512bwz.19 for ; Wed, 02 Mar 2011 01:48:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=OgEHQO8+f3ZLLUEGZ033nzevWNUunAZ0nWq4/3CAtjY=; b=QZmPx/Net5tAWX1llKOlM+VOghfwxKsv27NVX7Gt4uQLklX5L/n0xrh9211bUiQwto /wNeSOFIRl2IAVemcWiBfEjnrcAaF79bw0gijh67AJzvlcSbcVBg28nUiv4ngPI8d4vA +AoPbUbzrBMJfWIM3OqUf53A5nrUifXAg6lfA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=VvSQ2oPcN8XD5I898YFC4c4FPGE+Eom8TzD3tqSscsYJ/w/Tjq4hmfdgzgi/ndgZQj 2Hc7nC9fU8BLvRJSZmEVh+GPfsAFir7J5ZVDkPlDviWLKWU9rRtO1E2mhZMIX58s7Ycu rObAgS1o3BMb6moCTTTTXwL1ew8rzWa+MqvGo= Received: by 10.204.102.144 with SMTP id g16mr3099409bko.200.1299059312283; Wed, 02 Mar 2011 01:48:32 -0800 (PST) Received: from localhost.localdomain (p5495A84D.dip.t-dialin.net [84.149.168.77]) by mx.google.com with ESMTPS id x6sm802174bkv.12.2011.03.02.01.48.30 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 02 Mar 2011 01:48:31 -0800 (PST) From: Helmut Schaa To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, coelho@ti.com, Helmut Schaa Subject: [PATCH] wl12xx: Correctly set up protection if non-GF STAs are present Date: Wed, 2 Mar 2011 10:46:46 +0100 Message-Id: <1299059206-3919-1-git-send-email-helmut.schaa@googlemail.com> X-Mailer: git-send-email 1.7.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 02 Mar 2011 09:48:39 +0000 (UTC) diff --git a/drivers/net/wireless/wl12xx/acx.c b/drivers/net/wireless/wl12xx/acx.c index 3badc6b..a3db755 100644 --- a/drivers/net/wireless/wl12xx/acx.c +++ b/drivers/net/wireless/wl12xx/acx.c @@ -1361,7 +1361,8 @@ int wl1271_acx_set_ht_information(struct wl1271 *wl, acx->ht_protection = (u8)(ht_operation_mode & IEEE80211_HT_OP_MODE_PROTECTION); acx->rifs_mode = 0; - acx->gf_protection = 0; + acx->gf_protection = + !!(ht_operation_mode & IEEE80211_HT_OP_MODE_NON_GF_STA_PRSNT); acx->ht_tx_burst_limit = 0; acx->dual_cts_protection = 0;