From: Roy Marples <roy@marples.name>
Date: Tue, 3 May 2016 14:17:37 +0000 (+0000)
Subject: Remove useless range check.
X-Git-Tag: v6.11.0~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d3a9d1320b7ab2ce180112d238006488071e201;p=thirdparty%2Fdhcpcd.git

Remove useless range check.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 0c985942..09a5dd03 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1455,6 +1455,12 @@ main(int argc, char **argv)
 	const char *siga = NULL;
 #endif
 
+	int seq;
+	seq = INT_MAX;
+	printf ("%d\n", seq);
+	seq++;
+	printf ("%u\n", (uint32_t)seq);
+
 	/* Test for --help and --version */
 	if (argc > 1) {
 		if (strcmp(argv[1], "--help") == 0) {
diff --git a/dhcpcd.h b/dhcpcd.h
index a5b8cf45..08c7723b 100644
--- a/dhcpcd.h
+++ b/dhcpcd.h
@@ -122,8 +122,8 @@ struct dhcpcd_ctx {
 #endif
 	void *priv;
 	int link_fd;
-	unsigned int seq;	/* route message sequence no */
-	unsigned int sseq;	/* successful seq no sent */
+	int seq;	/* route message sequence no */
+	int sseq;	/* successful seq no sent */
 
 #ifdef USE_SIGNALS
 	sigset_t sigset;
diff --git a/if-linux.c b/if-linux.c
index 3898635f..d646d003 100644
--- a/if-linux.c
+++ b/if-linux.c
@@ -925,9 +925,7 @@ send_netlink(struct dhcpcd_ctx *ctx, struct interface *ifp,
 	msg.msg_iovlen = 1;
 	/* Request a reply */
 	hdr->nlmsg_flags |= NLM_F_ACK;
-	if (++ctx->seq > UINT32_MAX)
-		ctx->seq = 0;
-	hdr->nlmsg_seq = (uint32_t)ctx->seq;
+	hdr->nlmsg_seq = (uint32_t)++ctx->seq;
 	if (sendmsg(s, &msg, 0) != -1) {
 		ctx->sseq = ctx->seq;
 		r = get_netlink(ctx, ifp, s, 0, callback);