Commit dc91e3be authored by David S. Miller's avatar David S. Miller
Browse files

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



This reverts commit 13510fef.

Causes build warnings.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 13510fef

net/core/pktgen.c

+3 −2
Original line number Diff line number Diff line
@@ -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]);