From: Chi-Hsien Lin <Chi-Hsien.Lin@cypress.com>
To: "backports@vger.kernel.org" <backports@vger.kernel.org>,
Johannes Berg <johannes@sipsolutions.net>
Cc: Winnie Chang <Winnie.Chang@cypress.com>,
Winnie Chang <Winnie.Chang@cypress.com>,
Chi-Hsien Lin <Chi-Hsien.Lin@cypress.com>
Subject: [PATCH] backports: add strreplace()
Date: Wed, 19 Sep 2018 10:01:14 +0000 [thread overview]
Message-ID: <1537351259-19914-1-git-send-email-chi-hsien.lin@cypress.com> (raw)
From: Winnie Chang <Winnie.Chang@cypress.com>
wireless-drivers-next.git commit cb18e2e9ec71 (brcmfmac: fix wrong
strnchr usage) used strreplace(), which is not available in kernel prior
to v4.12. Before this commit proprgates to linux-stable.git, add
strreplace() to avoid gentree failure.
Signed-off-by: Winnie Chang <winnie.chang@cypress.com>
Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
---
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-i=
nclude/linux/string.h
index b85d9c73dc27..4b35eb9f2baf 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 e00aa49c7e4a..b275d349f7eb 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 =3D=3D old)
+*s =3D new;
+return s;
+}
+EXPORT_SYMBOL_GPL(strreplace);
--
2.1.0
This message and any attachments may contain confidential information from =
Cypress or its subsidiaries. If it has been received in error, please advis=
e the sender and immediately delete this message.
--
To unsubscribe from this list: send the line "unsubscribe backports" in
next reply other threads:[~2018-09-19 15:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-19 10:01 Chi-Hsien Lin [this message]
2018-09-19 10:03 ` [PATCH] backports: add strreplace() Johannes Berg
2018-09-19 10:57 ` Chi-Hsien Lin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1537351259-19914-1-git-send-email-chi-hsien.lin@cypress.com \
--to=chi-hsien.lin@cypress.com \
--cc=Winnie.Chang@cypress.com \
--cc=backports@vger.kernel.org \
--cc=johannes@sipsolutions.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).