]> www.infradead.org Git - users/griffoul/linux.git/commitdiff
net: pktgen: Use min()/min_t() to improve pktgen_finalize_skb()
authorThorsten Blum <thorsten.blum@linux.dev>
Fri, 15 Aug 2025 15:33:33 +0000 (17:33 +0200)
committerPaolo Abeni <pabeni@redhat.com>
Thu, 21 Aug 2025 08:12:11 +0000 (10:12 +0200)
Use min() and min_t() to improve pktgen_finalize_skb() and avoid
calculating 'datalen / frags' twice.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Link: https://patch.msgid.link/20250815153334.295431-3-thorsten.blum@linux.dev
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
net/core/pktgen.c

index 0ebe5461d4d967d8bbc252718e487789e3921da9..d41b03fd1f636302a8e1afff564f2726405c7d16 100644 (file)
 
 #include <linux/sys.h>
 #include <linux/types.h>
+#include <linux/minmax.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
@@ -2841,8 +2842,7 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb,
                }
 
                i = 0;
-               frag_len = (datalen/frags) < PAGE_SIZE ?
-                          (datalen/frags) : PAGE_SIZE;
+               frag_len = min_t(int, datalen / frags, PAGE_SIZE);
                while (datalen > 0) {
                        if (unlikely(!pkt_dev->page)) {
                                int node = numa_node_id();
@@ -2859,8 +2859,7 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb,
                        if (i == (frags - 1))
                                skb_frag_fill_page_desc(&skb_shinfo(skb)->frags[i],
                                                        pkt_dev->page, 0,
-                                                       (datalen < PAGE_SIZE ?
-                                                        datalen : PAGE_SIZE));
+                                                       min(datalen, PAGE_SIZE));
                        else
                                skb_frag_fill_page_desc(&skb_shinfo(skb)->frags[i],
                                                        pkt_dev->page, 0, frag_len);