| Message ID | 1537354267-42104-1-git-send-email-chi-hsien.lin@cypress.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] backports: add strreplace() | expand |
On Wed, 2018-09-19 at 10:51 +0000, Chi-Hsien Lin wrote: > 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.2. Before this commit proprgates to linux-stable.git, add > strreplace() to avoid gentree failure. Something's fishy with your email - there's no whitespace in it at all?? Anyway, since it was only a few lines I've fixed it up, but please check what the reason was before/when you send a new patch. Thanks, johannes -- To unsubscribe from this list: send the line "unsubscribe backports" in
On 09/24/2018 3:19, Johannes Berg wrote: > On Wed, 2018-09-19 at 10:51 +0000, Chi-Hsien Lin wrote: >> 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.2. Before this commit proprgates to linux-stable.git, add >> strreplace() to avoid gentree failure. > > Something's fishy with your email - there's no whitespace in it at all?? > > Anyway, since it was only a few lines I've fixed it up, but please check > what the reason was before/when you send a new patch. Thanks for catching this. It's identified to be caused by our SMTP server which does extra processing to external mails. I will work with our IT to fix it and make sure it doesn't happen in our future patch submissions. Regards, Chi-hsien Lin -- To unsubscribe from this list: send the line "unsubscribe backports" in
diff --git a/backport/backport-include/linux/string.h b/backport/backport-include/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 == old) +*s = new; +return s; +} +EXPORT_SYMBOL_GPL(strreplace);