Revert "pktgen: use min() to make code cleaner"

This reverts commit 13510fef48a3803d9ee8f044b015dacfb06fe0f5.

Causes build warnings.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 239effb..560a5e7 100644 (file)
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2778,7 +2778,8 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb,
                }
 
                i = 0;
-               frag_len = min(datalen / frags, PAGE_SIZE);
+               frag_len = (datalen/frags) < PAGE_SIZE ?
+                          (datalen/frags) : PAGE_SIZE;
                while (datalen > 0) {
                        if (unlikely(!pkt_dev->page)) {
                                int node = numa_node_id();
@@ -2795,7 +2796,7 @@ static void pktgen_finalize_skb(struct pktgen_dev *pkt_dev, struct sk_buff *skb,
                        /*last fragment, fill rest of data*/
                        if (i == (frags - 1))
                                skb_frag_size_set(&skb_shinfo(skb)->frags[i],
-                                   min(datalen, PAGE_SIZE));
+                                   (datalen < PAGE_SIZE ? datalen : PAGE_SIZE));
                        else
                                skb_frag_size_set(&skb_shinfo(skb)->frags[i], frag_len);
                        datalen -= skb_frag_size(&skb_shinfo(skb)->frags[i]);