From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 663FAC5B57D for ; Wed, 3 Jul 2019 02:20:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 352D321873 for ; Wed, 3 Jul 2019 02:20:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562120428; bh=ir13Ec46CPT/YhTZAT4s3lDqCnvfFlUlksV2FP4DDmQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=04bPCEgnyFsX408Goow44wxFSu9LZrd/Mvka0QH2E6vP4BuQJfyM4hQjKyHYLwJrT vdwBmj/XUhYxYPyjFn0DH1jwyRoa35P44XL6Xru4HsoORJuUsd5qtHvDZwYCP3pYAo uaasCASiI1G4IsTA/Bi69bMhMTV5IEdT06O6ovsM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728147AbfGCCU1 (ORCPT ); Tue, 2 Jul 2019 22:20:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:56342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727967AbfGCCSX (ORCPT ); Tue, 2 Jul 2019 22:18:23 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1567021897; Wed, 3 Jul 2019 02:18:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562120302; bh=ir13Ec46CPT/YhTZAT4s3lDqCnvfFlUlksV2FP4DDmQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YVtRnyXD2XKtYZmkLLzFKCb8ss465WLzm4NVv7/0jxLz5V4tyg+f8jp1h/AOISWbe Jlxo788S+sVL05hveryNBkPrKK/wdzy55oNa4LfN5AmfUb+6kevwDTjeltjrxMK6eB tf+FVtWexHk8lezkFy3QXLqODtSgS4+M5QYTJU5o= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , "David S . Miller" , Sasha Levin , linux-ppp@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 06/13] ppp: mppe: Add softdep to arc4 Date: Tue, 2 Jul 2019 22:18:07 -0400 Message-Id: <20190703021814.18385-6-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190703021814.18385-1-sashal@kernel.org> References: <20190703021814.18385-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai [ Upstream commit aad1dcc4f011ea409850e040363dff1e59aa4175 ] The arc4 crypto is mandatory at ppp_mppe probe time, so let's put a softdep line, so that the corresponding module gets prepared gracefully. Without this, a simple inclusion to initrd via dracut failed due to the missing dependency, for example. Signed-off-by: Takashi Iwai Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ppp/ppp_mppe.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c index 6c7fd98cb00a..d9eda7c217e9 100644 --- a/drivers/net/ppp/ppp_mppe.c +++ b/drivers/net/ppp/ppp_mppe.c @@ -63,6 +63,7 @@ MODULE_AUTHOR("Frank Cusack "); 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 -- 2.20.1