From patchwork Tue Sep 3 07:00:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\(Exiting\) Baolin Wang" X-Patchwork-Id: 172783 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp5278734ily; Tue, 3 Sep 2019 00:01:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIAMXS3fCmJkxWr4ZPgkDrkeUqwX5NVFhG5V3dw5ghdO+3FtvzWJbeNwWNYFWkUeNRnG+g X-Received: by 2002:a62:3681:: with SMTP id d123mr38321058pfa.147.1567494072196; Tue, 03 Sep 2019 00:01:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567494072; cv=none; d=google.com; s=arc-20160816; b=SKbU2gBxYJbZvfVCK+MbdUG55EnPmzX+2gJod9ieX3qplFVWKjzTx8HzYBQVPOV6dX nqV/Pn2wuI2WVAXQqFRsc3WTW45YpVzUBojfTJ2CWVtcr/vxW7sk3t5diXkPB5V6Y8EX M/SeC0czJphJ9XZ3eG+ocr+L2ZL4DUBm22LHSZFuwQL+QpNs3GgF8F3GFdoz1O3nTfVA NTVuheZRzg9e09BDeBhW2ozAa+KrOEUdiRh+op+y8HANuHpDFBvV8DloMVV//f0wdrQt JMg0TImamcgai4Oovgb+K/lAPgqNf8vX/qmiQfb+v6p+AEdNZ35m5TolGDp6Wn8D8ZuI Aekg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=NagLdWBO+mVhn30698+wliEZ00FrD+Sqb7vGzKlD9Rw=; b=kiITKpiisieWtuL5Ftgt9z8LMzEyykeLh9bOZAFoF8+G+5uGyYi9O70PE9VflEcNYr P+xjTvxx/ggUD8X5cK9z2gXr7CJk4rf5dVJPy5mKq9RhkYStg7TjAuVKGteuGDE5RLUh 9GH7e4xBP+63m9GDH613ppMfJfeM7XLlrReLyVhMNYp/Sefr4dtwL72/y+tSyINSILOH IOJhQhNP+ONal9z9Vk0j77lUzMk5HNJFFj07+CzCB7TZfr6diaXQdjsS1U6bu8+fj7av AbrtwMajOMVOqc7co97u5C6DJC4NS0BD4gSOiJWnmokJR5ZBNkQxUyKJfJpIRCFiwxGj ET+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZGril3dA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b3si16308609pfo.1.2019.09.03.00.01.11; Tue, 03 Sep 2019 00:01:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZGril3dA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727573AbfICHBK (ORCPT + 28 others); Tue, 3 Sep 2019 03:01:10 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:36433 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726864AbfICHBJ (ORCPT ); Tue, 3 Sep 2019 03:01:09 -0400 Received: by mail-pf1-f195.google.com with SMTP id y22so4545132pfr.3 for ; Tue, 03 Sep 2019 00:01:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NagLdWBO+mVhn30698+wliEZ00FrD+Sqb7vGzKlD9Rw=; b=ZGril3dAsuGwTavstK9zZ3BJG6PEETVIA/v8TKVQX6K6+iX0Zx9DFKW67oPSqKs0v8 V6eN3iypDFAfzPfF5kwk2Bx1xR+ZmGLyADXVtKN2r0AdE7sZAiNg6s5CZ1skw9uk5SL6 CiIDzSIqNerBAgl0+GLmQi/+gl9BrdRCJ5I1hrv+b4Ku2GVOFju2wK07C4ygA25YOe+S yEj2KCIBtqsB0WxIr+VItYXU0nuhoP5ERMFbR1mEjPbIU45ywPByWD6gUNi3h9aMsWBo 8gdyS3znC6ekRkcNQ2q6pXY1d8TXng5msBequzeGcHgr8ozAPLmABOR49tnjehtQWsjm LR7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NagLdWBO+mVhn30698+wliEZ00FrD+Sqb7vGzKlD9Rw=; b=tG16LUqLztvPUlfpt8XXxMrPuT8+M6VmX+FyEH2rQTxWqAd4CTRZ0GxykfXNykfUpS YMIJmSGj3lzzIS2up5A312g9aqfU455jNc+n62VhGzvn48zpsgU8LJoDSj35Ne1bjDQ1 C80PzEqkCqWPbqREtpicBn3Piv/1r/gZ6RssTNXCjb5xcUUpG259rN+z75n/D/8kAm1x 5M9PtkqGMuVJfWLUnNxNRaR2FtAaJDaFid2Oze6l9FABrJvZl6wKDqP8ZtpXUw0nEVrv MfbcNTNGeF//PG7m2eZB4ndCfnah1untJqrld+kRsj/ad+o2FDXKPb50NbRwDxzanKn5 z+XQ== X-Gm-Message-State: APjAAAVSgRmdWIMAF0n4CGiX6TWC17dqaKRfSZnqXqlrTsckgp9A62Kn k8D3I10eieTHHHMOfRGZJxRYBg== X-Received: by 2002:a65:6859:: with SMTP id q25mr28225218pgt.181.1567494069011; Tue, 03 Sep 2019 00:01:09 -0700 (PDT) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id l72sm26377107pjb.7.2019.09.03.00.01.06 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Sep 2019 00:01:08 -0700 (PDT) From: Baolin Wang To: stable@vger.kernel.org, paulus@samba.org Cc: ebiggers@google.com, linux-ppp@vger.kernel.org, netdev@vger.kernel.org, arnd@arndb.de, baolin.wang@linaro.org, orsonzhai@gmail.com, vincent.guittot@linaro.org, linux-kernel@vger.kernel.org Subject: [BACKPORT 4.14.y 7/8] ppp: mppe: Revert "ppp: mppe: Add softdep to arc4" Date: Tue, 3 Sep 2019 15:00:38 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Eric Biggers Commit 0e5a610b5ca5 ("ppp: mppe: switch to RC4 library interface"), which was merged through the crypto tree for v5.3, changed ppp_mppe.c to use the new arc4_crypt() library function rather than access RC4 through the dynamic crypto_skcipher API. Meanwhile commit aad1dcc4f011 ("ppp: mppe: Add softdep to arc4") was merged through the net tree and added a module soft-dependency on "arc4". The latter commit no longer makes sense because the code now uses the "libarc4" module rather than "arc4", and also due to the direct use of arc4_crypt(), no module soft-dependency is required. So revert the latter commit. Cc: Takashi Iwai Cc: Ard Biesheuvel Signed-off-by: Eric Biggers Signed-off-by: David S. Miller Signed-off-by: Baolin Wang --- drivers/net/ppp/ppp_mppe.c | 1 - 1 file changed, 1 deletion(-) -- 1.7.9.5 diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c index d9eda7c..6c7fd98 100644 --- a/drivers/net/ppp/ppp_mppe.c +++ b/drivers/net/ppp/ppp_mppe.c @@ -63,7 +63,6 @@ MODULE_DESCRIPTION("Point-to-Point Protocol Microsoft Point-to-Point Encryption support"); MODULE_LICENSE("Dual BSD/GPL"); MODULE_ALIAS("ppp-compress-" __stringify(CI_MPPE)); -MODULE_SOFTDEP("pre: arc4"); MODULE_VERSION("1.0.2"); static unsigned int