From patchwork Tue Aug 2 09:43:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 1028492 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p729hRFK028364 for ; Tue, 2 Aug 2011 09:43:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750939Ab1HBJnR (ORCPT ); Tue, 2 Aug 2011 05:43:17 -0400 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 Received: by gyh3 with SMTP id 3so3947579gyh.19 for ; Tue, 02 Aug 2011 02:43:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=b7TMdvTmaXnrjhNUPcJ2zxvl9ryvcK9hw/P3OBxEEmI=; b=LaAXeoB7PHeIDDOMqHN7PEuEh3/kdZwWy2y3qU8Jo10e7sbuRuIFeTaexOf8erYBFz DhaHx7ZGtkSYoGLd4bwgHXkcM85CHdPhfpCYBUwkEEHLCtS+EC9gHq/YaMRQx9c+vqNV nFUUBWVRE8B/P8wFDS7f0L9UmO2UmRRbJkSUI= MIME-Version: 1.0 Received: by 10.236.184.202 with SMTP id s50mr1084125yhm.55.1312278194827; Tue, 02 Aug 2011 02:43:14 -0700 (PDT) Received: by 10.236.105.180 with HTTP; Tue, 2 Aug 2011 02:43:14 -0700 (PDT) Date: Tue, 2 Aug 2011 11:43:14 +0200 Message-ID: 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 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]); Tue, 02 Aug 2011 09:43:27 +0000 (UTC) This was introduced by commit 77b5621bac4a56b83b9081f48d4e7d1accdde400 (rt2x00: Don't use queue entry as parameter when creating TX descriptor.) Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Reported-by: Randy Dunlap Acked-by: Randy Dunlap --- 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)