From patchwork Sat Jan 26 21:19:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 2050491 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 2E21AE01EC for ; Sat, 26 Jan 2013 21:36:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754424Ab3AZVgq (ORCPT ); Sat, 26 Jan 2013 16:36:46 -0500 Received: from mail-ea0-f174.google.com ([209.85.215.174]:54021 "EHLO mail-ea0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754320Ab3AZVgo (ORCPT ); Sat, 26 Jan 2013 16:36:44 -0500 Received: by mail-ea0-f174.google.com with SMTP id 1so661212eaa.33 for ; Sat, 26 Jan 2013 13:36:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:from:date:subject:to:cc:message-id; bh=4HrIv/QwRtyE1ix2Xc2hvp8uHlUdTNiwWNDWwSr5Cwc=; b=McgMbVVjjI8IOqjm1Y84QiHxq09l8GlZ4YfkjY6P9O8wKHFuDnNFSpGpHbEyAWjI9Y v1CQR+ovn72ZFgFn+kNgSSPhTDuZZDQ10jx8P9s4iAvPN3F3XPpOPMYhcqnHh7LOZIip a8iWlR1gtXrVcAFNsbK7RovxMgfvriOfMMbkSedXiIVdykN/rsRFpj8X4tJIe9Pvn7CT D5tgC0wzG9rTlbLGdpOuf6AqUMUTjgd32e8G87YuiiXSd+JmRuA8BrhZCOwmhDuyrv5M vPDxEiMtyrZxcw+skInJ/J8ikHJplIqNfJDDw2DmaAE2tGs1XWlilqwBTD2BYTUi5Lyr UG0Q== X-Received: by 10.14.225.72 with SMTP id y48mr33602386eep.46.1359236203443; Sat, 26 Jan 2013 13:36:43 -0800 (PST) Received: from debian64.localnet (pD9F8BA63.dip.t-dialin.net. [217.248.186.99]) by mx.google.com with ESMTPS id 3sm8322645eej.6.2013.01.26.13.36.41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 26 Jan 2013 13:36:42 -0800 (PST) Received: from localhost ([127.0.0.1] helo=debian64.localnet ident=chuck) by debian64.localnet with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1TzDQW-0001Fa-7P; Sat, 26 Jan 2013 22:36:40 +0100 From: Christian Lamparter Date: Sat, 26 Jan 2013 22:19:35 +0100 Subject: [PATCH 1/2] iwlegacy: fix antenna bitmask To: linux-wireless@vger.kernel.org Cc: sgruszka@redhat.com, John Linville Message-Id: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This patch is based on "iwlwifi: fix antenna bitmask". (362b0563b28506d53) Like the new iwlagn devices, the old 4965N device only supports a maximum of three antennas. Hence only three bits are used, the fourth bit is likely the A-MPDU indicator. Cc: Stanislaw Gruszka Signed-off-by: Christian Lamparter --- drivers/net/wireless/iwlegacy/commands.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/iwlegacy/commands.h b/drivers/net/wireless/iwlegacy/commands.h index 25dd7d2..829d3b9 100644 --- a/drivers/net/wireless/iwlegacy/commands.h +++ b/drivers/net/wireless/iwlegacy/commands.h @@ -1134,7 +1134,7 @@ struct il_wep_cmd { #define RX_RES_PHY_FLAGS_MOD_CCK_MSK cpu_to_le16(1 << 1) #define RX_RES_PHY_FLAGS_SHORT_PREAMBLE_MSK cpu_to_le16(1 << 2) #define RX_RES_PHY_FLAGS_NARROW_BAND_MSK cpu_to_le16(1 << 3) -#define RX_RES_PHY_FLAGS_ANTENNA_MSK 0xf0 +#define RX_RES_PHY_FLAGS_ANTENNA_MSK 0x70 #define RX_RES_PHY_FLAGS_ANTENNA_POS 4 #define RX_RES_STATUS_SEC_TYPE_MSK (0x7 << 8)