From patchwork Thu Mar 3 18:44:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 607001 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 p23Imj2q021009 for ; Thu, 3 Mar 2011 18:49:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758698Ab1CCStB (ORCPT ); Thu, 3 Mar 2011 13:49:01 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:35605 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754069Ab1CCStA (ORCPT ); Thu, 3 Mar 2011 13:49:00 -0500 Received: by mail-wy0-f174.google.com with SMTP id 36so1356532wyg.19 for ; Thu, 03 Mar 2011 10:49:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id; bh=F4wb3UCI6OEqIvCbF8DVna6jye2EtqgcD1n1kDRBYl0=; b=OmnMbCjCEpHz9LOjZK+D6N6a415wyoX9TymC/+uqX5Eew1F5jgyoEICfewL3YY299I bL6AD0JDB9rc7efQT5DXRs76s7Bhlkzyh6hEAMTj7Zn8YTkEjRVITLI18FymMdoQDO4O UFUoMgF9SohYlU5g9xU5rQQ0HMRPbfoXpgxJE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; b=PXAPXiWMfIYXrj0jvZd6rSdiPeJqDHrt3HzbrqzKVAhgDH9efjPTICqQ+NLoHPPIgL /GG92KhfO4MoyYhaLpkoNZuxoLwbxmLkUPq/vwAy2v342Wdwhns3jnDhgGiXz8ltn994 fwTztZf4pP/YCeN2nV16qVD7Np9uV9MkzacEs= Received: by 10.216.154.8 with SMTP id g8mr950404wek.12.1299178140291; Thu, 03 Mar 2011 10:49:00 -0800 (PST) Received: from localhost.localdomain (g121037.upc-g.chello.nl [80.57.121.37]) by mx.google.com with ESMTPS id j49sm738659wer.14.2011.03.03.10.48.57 (version=SSLv3 cipher=OTHER); Thu, 03 Mar 2011 10:48:58 -0800 (PST) From: Ivo van Doorn To: "John W. Linville" Subject: [PATCH 13/19] rt2x00: Remove now unused crypto.aid field Date: Thu, 3 Mar 2011 19:44:53 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.32.26-175.fc12.x86_64; KDE/4.4.5; x86_64; ; ) Cc: linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com References: <201103031938.56423.IvDoorn@gmail.com> <201103031944.11965.IvDoorn@gmail.com> <201103031944.33950.IvDoorn@gmail.com> In-Reply-To: <201103031944.33950.IvDoorn@gmail.com> MIME-Version: 1.0 Message-Id: <201103031944.54527.IvDoorn@gmail.com> 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]); Thu, 03 Mar 2011 18:49:20 +0000 (UTC) diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index e17e348..d5faeb1 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h @@ -467,7 +467,6 @@ struct rt2x00lib_crypto { const u8 *address; u32 bssidx; - u32 aid; u8 key[16]; u8 tx_mic[8]; diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 9529d6f..67c99c3 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c @@ -519,11 +519,9 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, crypto.cmd = cmd; - if (sta) { - /* some drivers need the AID */ - crypto.aid = sta->aid; + if (sta) crypto.address = sta->addr; - } else + else crypto.address = bcast_addr; if (crypto.cipher == CIPHER_TKIP)