Return-path: Received: from mail-gy0-f174.google.com ([209.85.160.174]:65282 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750807Ab1HBJnP (ORCPT ); Tue, 2 Aug 2011 05:43:15 -0400 MIME-Version: 1.0 Date: Tue, 2 Aug 2011 11:43:14 +0200 Message-ID: (sfid-20110802_114328_842741_39F0310E) Subject: [PATCH] rt2x00: Fix compilation without CONFIG_RT2X00_LIB_CRYPTO From: Helmut Schaa To: "John W. Linville" Cc: Stephen Rothwell , linux-wireless@vger.kernel.org, linux-next@vger.kernel.org, LKML , Ivo van Doorn , Randy Dunlap Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: This was introduced by commit 77b5621bac4a56b83b9081f48d4e7d1accdde400 (rt2x00: Don't use queue entry as parameter when creating TX descriptor.) Signed-off-by: Helmut Schaa --- Sending directly to John as I assume this should go through the wireless tree? drivers/net/wireless/rt2x00/rt2x00lib.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2x00lib.h b/drivers/net/wireless/rt2x00/rt2x00lib.h index 15cdc7e..4cdf247 100644 --- a/drivers/net/wireless/rt2x00/rt2x00lib.h +++ b/drivers/net/wireless/rt2x00/rt2x00lib.h @@ -355,7 +355,8 @@ static inline enum cipher rt2x00crypto_key_to_cipher(struct ieee80211_key_conf * return CIPHER_NONE; } -static inline void rt2x00crypto_create_tx_descriptor(struct queue_entry *entry, +static inline void rt2x00crypto_create_tx_descriptor(struct rt2x00_dev *rt2x00dev, + struct sk_buff *skb, struct txentry_desc *txdesc) { } -- 1.7.3.4