From patchwork Sat Dec 15 22:21:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 1905781 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 011743FCA5 for ; Sat, 22 Dec 2012 14:51:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751364Ab2LVOv2 (ORCPT ); Sat, 22 Dec 2012 09:51:28 -0500 Received: from mail-we0-f172.google.com ([74.125.82.172]:40689 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751144Ab2LVOv1 (ORCPT ); Sat, 22 Dec 2012 09:51:27 -0500 X-Greylist: delayed 319 seconds by postgrey-1.27 at vger.kernel.org; Sat, 22 Dec 2012 09:51:27 EST Received: by mail-we0-f172.google.com with SMTP id r3so2714602wey.3 for ; Sat, 22 Dec 2012 06:51:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:in-reply-to:references:from:date:subject:to :cc; bh=fR0/DhYrmS+8c9SSvy4M/bZ7w1q3cgSQH95QPBjtXlk=; b=sGpw4fWLnJowWIr4vCSR/WC8nKDY1ueBwL8+LAHAWCnx/J2fxVbKf7thtTHjpgUvA+ Qd2yaCS1nKr9aZFH6wCOMXkGTgpELDc3yIccBSdQ9Fv6tJZDfEpcMJwiGibLGfW8rYYn dqZOgY182pLCm5QR0dKzZKgnIklgXK4W3Y1sl8qhfwSpCQDjcc7HmCoXWbURveFfEFJa 0s2hYEXoA6vVei+aGKEtHTo6msn4z401kb6xGfVWbZI5fiOBKJ4Wl+XiXXmmgiFJ2hCN o8sQCvREedvN4OL+u4lirGxlU5oqBKSzi3PLslKjgbbY/55UNf3vnbwTS5AZkxmDTIiG QD8g== X-Received: by 10.194.83.36 with SMTP id n4mr28545103wjy.59.1356187574023; Sat, 22 Dec 2012 06:46:14 -0800 (PST) Received: from debian64.localnet (pD9F88B3A.dip.t-dialin.net. [217.248.139.58]) by mx.google.com with ESMTPS id dw4sm23554026wib.1.2012.12.22.06.46.12 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 22 Dec 2012 06:46:13 -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 1TmQL2-0004Aa-QF; Sat, 22 Dec 2012 15:46:09 +0100 Message-Id: In-Reply-To: <8f92b38a456c1dd901ce2022fcb66609a5b8ac4b.1356186145.git.chunkeey@googlemail.com> References: <8f92b38a456c1dd901ce2022fcb66609a5b8ac4b.1356186145.git.chunkeey@googlemail.com> From: Christian Lamparter Date: Sat, 15 Dec 2012 23:21:32 +0100 Subject: [PATCH 3/8] carl9170: import 1.9.7 firmware headers To: linux-wireless@vger.kernel.org Cc: linville@tuxdriver.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Import new headers from my firmware branch: visit our wiki at: Signed-off-by: Christian Lamparter --- drivers/net/wireless/ath/carl9170/fwcmd.h | 8 ++++++++ drivers/net/wireless/ath/carl9170/hw.h | 2 +- drivers/net/wireless/ath/carl9170/version.h | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/carl9170/fwcmd.h b/drivers/net/wireless/ath/carl9170/fwcmd.h index 9443c80..9111d4f 100644 --- a/drivers/net/wireless/ath/carl9170/fwcmd.h +++ b/drivers/net/wireless/ath/carl9170/fwcmd.h @@ -156,6 +156,14 @@ struct carl9170_psm { } __packed; #define CARL9170_PSM_SIZE 4 +/* + * Note: If a bit in rx_filter is set, then it + * means that the particular frames which matches + * the condition are FILTERED/REMOVED/DISCARDED! + * (This is can be a bit confusing, especially + * because someone people think it's the exact + * opposite way, so watch out!) + */ struct carl9170_rx_filter_cmd { __le32 rx_filter; } __packed; diff --git a/drivers/net/wireless/ath/carl9170/hw.h b/drivers/net/wireless/ath/carl9170/hw.h index fa834c1..0db874a 100644 --- a/drivers/net/wireless/ath/carl9170/hw.h +++ b/drivers/net/wireless/ath/carl9170/hw.h @@ -384,7 +384,7 @@ #define AR9170_MAC_REG_BCN_ADDR (AR9170_MAC_REG_BASE + 0xd84) #define AR9170_MAC_REG_BCN_LENGTH (AR9170_MAC_REG_BASE + 0xd88) -#define AR9170_MAC_BCN_LENGTH_MAX 256 +#define AR9170_MAC_BCN_LENGTH_MAX (512 - 32) #define AR9170_MAC_REG_BCN_STATUS (AR9170_MAC_REG_BASE + 0xd8c) diff --git a/drivers/net/wireless/ath/carl9170/version.h b/drivers/net/wireless/ath/carl9170/version.h index 2ec3e91..2282847 100644 --- a/drivers/net/wireless/ath/carl9170/version.h +++ b/drivers/net/wireless/ath/carl9170/version.h @@ -1,7 +1,7 @@ #ifndef __CARL9170_SHARED_VERSION_H #define __CARL9170_SHARED_VERSION_H #define CARL9170FW_VERSION_YEAR 12 -#define CARL9170FW_VERSION_MONTH 7 -#define CARL9170FW_VERSION_DAY 7 -#define CARL9170FW_VERSION_GIT "1.9.6" +#define CARL9170FW_VERSION_MONTH 12 +#define CARL9170FW_VERSION_DAY 15 +#define CARL9170FW_VERSION_GIT "1.9.7" #endif /* __CARL9170_SHARED_VERSION_H */