From patchwork Thu Jan 16 11:16:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 3498041 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D6DCAC02DC for ; Thu, 16 Jan 2014 11:16:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D4D4820170 for ; Thu, 16 Jan 2014 11:16:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB68820179 for ; Thu, 16 Jan 2014 11:16:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752470AbaAPLQh (ORCPT ); Thu, 16 Jan 2014 06:16:37 -0500 Received: from mail-wg0-f51.google.com ([74.125.82.51]:64120 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752287AbaAPLQh (ORCPT ); Thu, 16 Jan 2014 06:16:37 -0500 Received: by mail-wg0-f51.google.com with SMTP id z12so2952237wgg.18 for ; Thu, 16 Jan 2014 03:16:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=m7mGCxnMPS36M+EXGnQz3G1eFr460jQ3u9Z6Hmdq5lc=; b=KuJbBwiHCgmBtd0CZotMwdV89Lk6LcminqPuGDMiYkMzfcllKMNvGClkJ69IuqL279 BWHt7fU2vQTVds5CShb+j0o2zSOpmEiP3x6amGPHwzW4MhOgnaXdqo7UT4u6Vd68GZH1 BhaGRgJ/oPitVB7LpldrXqjNeM28cozVH0RhSPr7EMQYi6Yd+8g53+mX4gIC4yL0gaV5 /h6uHmb7DaAwtAHMoul9DyeevoTuWYOSQJdumvVcTZzTZ7kELD6EMNMdwZjiE/ngYMJk D1yzVWOZxxgxMYeDxaX79FdjkmVmq2NmEev8jS9NxFIyS5a4PNmE+gXR5EaAcjvjFRW0 fdiQ== X-Gm-Message-State: ALoCoQkgmTfVLIGZmepdcdS0233ZAm26h1C48kTakdsXwclMHpL9fpdKZ9Cy39Ro91hk2uZo//92 X-Received: by 10.194.109.68 with SMTP id hq4mr7914774wjb.12.1389870995786; Thu, 16 Jan 2014 03:16:35 -0800 (PST) Received: from ards-mac-mini.local (cag06-7-83-153-85-71.fbx.proxad.net. [83.153.85.71]) by mx.google.com with ESMTPSA id q15sm5903371wjw.18.2014.01.16.03.16.34 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 03:16:35 -0800 (PST) From: Ard Biesheuvel To: linux-wireless@vger.kernel.org, johannes@sipsolutions.net Cc: patches@linaro.org, Ard Biesheuvel Subject: [PATCH] mac80211: drop unused param 'encrypted' from ccmp_special_blocks() Date: Thu, 16 Jan 2014 12:16:30 +0100 Message-Id: <1389870990-3735-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 7ec7c4a9a686 ("mac80211: port CCMP to cryptoapi's CCM driver") resulted in the 'encrypted' param of ccmp_special_blocks() to be no longer used so it can be dropped from the prototype. Signed-off-by: Ard Biesheuvel --- net/mac80211/wpa.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index d65728220763..0781840c8415 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -301,8 +301,7 @@ ieee80211_crypto_tkip_decrypt(struct ieee80211_rx_data *rx) } -static void ccmp_special_blocks(struct sk_buff *skb, u8 *pn, u8 *b_0, u8 *aad, - int encrypted) +static void ccmp_special_blocks(struct sk_buff *skb, u8 *pn, u8 *b_0, u8 *aad) { __le16 mask_fc; int a4_included, mgmt; @@ -456,7 +455,7 @@ static int ccmp_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb) return 0; pos += IEEE80211_CCMP_HDR_LEN; - ccmp_special_blocks(skb, pn, b_0, aad, 0); + ccmp_special_blocks(skb, pn, b_0, aad); ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len, skb_put(skb, IEEE80211_CCMP_MIC_LEN)); @@ -524,7 +523,7 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx) u8 aad[2 * AES_BLOCK_SIZE]; u8 b_0[AES_BLOCK_SIZE]; /* hardware didn't decrypt/verify MIC */ - ccmp_special_blocks(skb, pn, b_0, aad, 1); + ccmp_special_blocks(skb, pn, b_0, aad); if (ieee80211_aes_ccm_decrypt( key->u.ccmp.tfm, b_0, aad,