diff options
| author |   Eric Biggers <ebiggers@google.com> | 2019-07-12 16:39:31 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-07-12 22:58:49 -0700 |
| commit | 25a09ce79639a8775244808c17282c491cff89cf (patch) | |
| tree | e347242a5c88ba561dbc50d1c12c1a6d6e7cada7 /drivers/net/ppp/ppp_mppe.c | |
| parent | net: dsa: qca8k: replace legacy gpio include (diff) | |
| download | linux-dev-25a09ce79639a8775244808c17282c491cff89cf.tar.xz linux-dev-25a09ce79639a8775244808c17282c491cff89cf.zip | |
ppp: mppe: Revert "ppp: mppe: Add softdep to arc4"
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 <tiwai@suse.de>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ppp/ppp_mppe.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ppp/ppp_mppe.c b/drivers/net/ppp/ppp_mppe.c index bd3c80b0bc77..de3b57d09d0c 100644 --- a/drivers/net/ppp/ppp_mppe.c +++ b/drivers/net/ppp/ppp_mppe.c @@ -64,7 +64,6 @@ MODULE_AUTHOR("Frank Cusack <fcusack@fcusack.com>"); 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"); #define SHA1_PAD_SIZE 40 |