From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 3 Oct 2014 20:16:49 +0000 (+0100)
Subject: netlink: Use MIN rather than ?:
X-Git-Tag: base.ipv6-polypath-fixes.v1~35
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=4ea3eeb803a561e97407755eee34426bc639d49f

netlink: Use MIN rather than ?:

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/netlink.c b/netlink.c
index e197e80..6016864 100644
--- a/netlink.c
+++ b/netlink.c
@@ -386,7 +386,7 @@ static uint16_t netlink_icmp_reply_len(struct buffer_if *buf)
     /* We include the first 8 bytes of the packet data, provided they exist */
     hlen+=8;
     plen=ntohs(iph->tot_len);
-    return (hlen>plen?plen:hlen);
+    return MIN(hlen,plen);
 }
 
 /* client indicates where the packet we're constructing a response to