From edd669e066483e89de8e4eba6bcc4583f4d01322 Mon Sep 17 00:00:00 2001 From: Winnie Chang Date: Wed, 19 Sep 2018 10:51:15 +0000 Subject: backports: add strreplace() wireless-drivers-next.git commit cb18e2e9ec71 (brcmfmac: fix wrong strnchr usage) used strreplace(), which is not available in kernel prior to v4.2. Before this commit proprgates to linux-stable.git, add strreplace() to avoid gentree failure. Signed-off-by: Winnie Chang Signed-off-by: Chi-Hsien Lin Signed-off-by: Johannes Berg --- backport/backport-include/linux/string.h | 4 ++++ backport/compat/backport-4.2.c | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/backport/backport-include/linux/string.h b/backport/backport-include/linux/string.h index b85d9c73..4b35eb9f 100644 --- a/backport/backport-include/linux/string.h +++ b/backport/backport-include/linux/string.h @@ -29,4 +29,8 @@ void memzero_explicit(void *s, size_t count); ssize_t strscpy(char *dest, const char *src, size_t count); #endif +#if LINUX_VERSION_IS_LESS(4,2,0) +char *strreplace(char *s, char old, char new); +#endif + #endif /* __BACKPORT_LINUX_STRING_H */ diff --git a/backport/compat/backport-4.2.c b/backport/compat/backport-4.2.c index e00aa49c..b275d349 100644 --- a/backport/compat/backport-4.2.c +++ b/backport/compat/backport-4.2.c @@ -65,3 +65,12 @@ struct aead_request *crypto_backport_convert(struct aead_request *req) return &nreq->subreq; } EXPORT_SYMBOL_GPL(crypto_backport_convert); + +char *strreplace(char *s, char old, char new) +{ + for (; *s; ++s) + if (*s == old) + *s = new; + return s; +} +EXPORT_SYMBOL_GPL(strreplace); -- cgit v1.2.3