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: 23268 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6BC71202FA for ; Thu, 16 Jan 2014 11:16:38 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id le5sf3740881vcb.11 for ; Thu, 16 Jan 2014 03:16:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=m7mGCxnMPS36M+EXGnQz3G1eFr460jQ3u9Z6Hmdq5lc=; b=KG78uvRnD89VW1SeCzpfLo6F5y+XUziCVuoxe8aeSdD0lT0ioxfWX7TwfVbPewMl44 IftJF6ok1tovB1t/v57Kb0ObwBys4ZK2TxjDCKNHIdrBvrWGktYYjWPTOoZnHOqf1/do 2VfFkSPiKpmMiOn9ZCfm3VePBVe/AlT5iqerwLSI0wg/bjVcWldHu6fXTYi8h38USqin NXzu6LiVLiFNWY0avEpfYS6aoEb4KC+R1IBgxjD3dpvmx7pMznTZEqhjUTxppo4AqaQd +CC5Qnb+Gw/R7jTI+RWmHJ2Ucc717ODMEi0SpeddYf/nMqvTm9H04/axE0AXQT+GcxWv x5cw== X-Gm-Message-State: ALoCoQnjr9F2t8RFmmGMh9mxkM/PXMSblSrtnaMJfs6MYDyZyYmuHivUdrlf8egBz9FA257BFddj X-Received: by 10.236.133.161 with SMTP id q21mr2491003yhi.18.1389870997648; Thu, 16 Jan 2014 03:16:37 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.62.169 with SMTP id z9ls670795qer.42.gmail; Thu, 16 Jan 2014 03:16:37 -0800 (PST) X-Received: by 10.52.231.130 with SMTP id tg2mr5229380vdc.16.1389870997492; Thu, 16 Jan 2014 03:16:37 -0800 (PST) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by mx.google.com with ESMTPS id a15si3208303vew.83.2014.01.16.03.16.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 03:16:37 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.45 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.45; Received: by mail-vb0-f45.google.com with SMTP id m10so888786vbh.4 for ; Thu, 16 Jan 2014 03:16:37 -0800 (PST) X-Received: by 10.58.90.202 with SMTP id by10mr6173048veb.6.1389870997200; Thu, 16 Jan 2014 03:16:37 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp338948ved; Thu, 16 Jan 2014 03:16:36 -0800 (PST) X-Received: by 10.194.123.8 with SMTP id lw8mr7782424wjb.40.1389870996264; Thu, 16 Jan 2014 03:16:36 -0800 (PST) Received: from mail-wi0-f172.google.com (mail-wi0-f172.google.com [209.85.212.172]) by mx.google.com with ESMTPS id mw18si5828937wic.8.2014.01.16.03.16.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Jan 2014 03:16:36 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.172 is neither permitted nor denied by best guess record for domain of ard.biesheuvel@linaro.org) client-ip=209.85.212.172; Received: by mail-wi0-f172.google.com with SMTP id ex4so4684250wid.11 for ; Thu, 16 Jan 2014 03:16:35 -0800 (PST) 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.45 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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,