From patchwork Thu Mar 9 12:57:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 9613301 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8A4E9602B4 for ; Thu, 9 Mar 2017 13:05:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 866E12862D for ; Thu, 9 Mar 2017 13:05:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AE4C28640; Thu, 9 Mar 2017 13:05:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C9DD284C2 for ; Thu, 9 Mar 2017 13:05:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932346AbdCINFj (ORCPT ); Thu, 9 Mar 2017 08:05:39 -0500 Received: from lpdvrndsmtp01.broadcom.com ([192.19.229.170]:43454 "EHLO rnd-relay.smtp.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932342AbdCINFi (ORCPT ); Thu, 9 Mar 2017 08:05:38 -0500 Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.224.233]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 0F55A30C26A; Thu, 9 Mar 2017 04:57:41 -0800 (PST) Received: from jenkins-cam-14.cam.broadcom.com (jenkins-cam-14.cam.broadcom.com [10.177.128.77]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id CE8CA81E9C; Thu, 9 Mar 2017 04:57:40 -0800 (PST) Received: by jenkins-cam-14.cam.broadcom.com (Postfix, from userid 25152) id DF6E2B84E66; Thu, 9 Mar 2017 12:57:39 +0000 (GMT) From: Arend van Spriel To: Johannes Berg Cc: backports@vger.kernel.org, Arend van Spriel Subject: [PATCH 1/4] patches: update crypto-ccm.patch for v4.11-rc1 Date: Thu, 9 Mar 2017 12:57:30 +0000 Message-Id: <1489064253-3652-2-git-send-email-arend.vanspriel@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1489064253-3652-1-git-send-email-arend.vanspriel@broadcom.com> References: <1489064253-3652-1-git-send-email-arend.vanspriel@broadcom.com> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since v4.11-rc1 the patch file for crypto/ccm.c, which is incorporated in the compat module, no longer applies. Update the patch file to fix the issue. Signed-off-by: Arend van Spriel --- patches/crypto-ccm.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/patches/crypto-ccm.patch b/patches/crypto-ccm.patch index 8bdea3d..7a44d37 100644 --- a/patches/crypto-ccm.patch +++ b/patches/crypto-ccm.patch @@ -1,7 +1,7 @@ --- a/compat/crypto-ccm.c +++ b/compat/crypto-ccm.c -@@ -13,13 +13,44 @@ - #include +@@ -14,13 +14,44 @@ + #include #include #include +#include @@ -46,7 +46,7 @@ struct ccm_instance_ctx { struct crypto_skcipher_spawn ctr; -@@ -897,7 +928,7 @@ static struct crypto_template crypto_rfc +@@ -1001,7 +1032,7 @@ static int cbcmac_create(struct crypto_template *tmpl, struct rtattr **tb) .module = THIS_MODULE, }; @@ -55,7 +55,7 @@ { int err; -@@ -923,18 +954,9 @@ out_undo_base: +@@ -1033,19 +1064,10 @@ static int __init crypto_ccm_module_init(void) goto out; } @@ -65,6 +65,7 @@ crypto_unregister_template(&crypto_rfc4309_tmpl); crypto_unregister_template(&crypto_ccm_tmpl); crypto_unregister_template(&crypto_ccm_base_tmpl); + crypto_unregister_template(&crypto_cbcmac_tmpl); } - -module_init(crypto_ccm_module_init);