summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Zetao <lizetao1@huawei.com>2024-08-22 15:39:03 +0200
committerJakub Kicinski <kuba@kernel.org>2024-08-26 18:48:53 +0200
commitb4985aa8e312fd40fbbce0fe44ce677368fdee43 (patch)
tree5d586b831573991920e089bd67f5bb9bc53520f0
parentMerge branch 'net-header-and-core-spelling-corrections' (diff)
downloadlinux-b4985aa8e312fd40fbbce0fe44ce677368fdee43.tar.xz
linux-b4985aa8e312fd40fbbce0fe44ce677368fdee43.zip
net: caif: use max() to simplify the code
When processing the tail append of sk buffer, the final length needs to be determined based on expectlen and addlen. Using max() here can increase the readability of the code. Signed-off-by: Li Zetao <lizetao1@huawei.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20240822133908.1042240-4-lizetao1@huawei.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--net/caif/cfpkt_skbuff.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/caif/cfpkt_skbuff.c b/net/caif/cfpkt_skbuff.c
index 2ae8cfa3df88..96236d21b18e 100644
--- a/net/caif/cfpkt_skbuff.c
+++ b/net/caif/cfpkt_skbuff.c
@@ -298,10 +298,8 @@ struct cfpkt *cfpkt_append(struct cfpkt *dstpkt,
if (unlikely(is_erronous(dstpkt) || is_erronous(addpkt))) {
return dstpkt;
}
- if (expectlen > addlen)
- neededtailspace = expectlen;
- else
- neededtailspace = addlen;
+
+ neededtailspace = max(expectlen, addlen);
if (dst->tail + neededtailspace > dst->end) {
/* Create a dumplicate of 'dst' with more tail space */