From c9f2371c5f13a71fc28eb8c60d2e2433c128773d Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Thu, 23 Feb 2012 15:44:08 -0500
Subject: [PATCH] --- yaml --- r: 290503 b: refs/heads/master c:
 732efba4d77e1b0857984c401a7b18784f51b075 h: refs/heads/master i:   290501:
 f571567179cf31f3586c7681cb83f59116a9d5cc   290499:
 81a576ede2b18c0191ac339578e180a8bda82352   290495:
 f59afb8185c5cd7d83c7e3e5552e1684c9b79dc9 v: v3

---
 [refs]                  |  2 +-
 trunk/net/tipc/config.c |  8 ++++----
 trunk/net/tipc/core.h   | 10 ----------
 trunk/net/tipc/log.c    |  2 +-
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index eeb8eeec403a..c15da5750fe9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f80c24d9964c8a15c55d1afc2dea327c5eff7d6b
+refs/heads/master: 732efba4d77e1b0857984c401a7b18784f51b075
diff --git a/trunk/net/tipc/config.c b/trunk/net/tipc/config.c
index 9fefd32e9b2e..69cca4f67e8e 100644
--- a/trunk/net/tipc/config.c
+++ b/trunk/net/tipc/config.c
@@ -218,7 +218,7 @@ static struct sk_buff *cfg_set_max_publications(void)
 		return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
 
 	value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
-	if (value != delimit(value, 1, 65535))
+	if (value < 1 || value > 65535)
 		return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
 						   " (max publications must be 1-65535)");
 	tipc_max_publications = value;
@@ -233,7 +233,7 @@ static struct sk_buff *cfg_set_max_subscriptions(void)
 		return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
 
 	value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
-	if (value != delimit(value, 1, 65535))
+	if (value < 1 || value > 65535)
 		return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
 						   " (max subscriptions must be 1-65535");
 	tipc_max_subscriptions = value;
@@ -249,7 +249,7 @@ static struct sk_buff *cfg_set_max_ports(void)
 	value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
 	if (value == tipc_max_ports)
 		return tipc_cfg_reply_none();
-	if (value != delimit(value, 127, 65535))
+	if (value < 127 || value > 65535)
 		return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
 						   " (max ports must be 127-65535)");
 	if (tipc_mode != TIPC_NOT_RUNNING)
@@ -268,7 +268,7 @@ static struct sk_buff *cfg_set_netid(void)
 	value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
 	if (value == tipc_net_id)
 		return tipc_cfg_reply_none();
-	if (value != delimit(value, 1, 9999))
+	if (value < 1 || value > 9999)
 		return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
 						   " (network id must be 1-9999)");
 	if (tipc_mode == TIPC_NET_MODE)
diff --git a/trunk/net/tipc/core.h b/trunk/net/tipc/core.h
index 2761af36d141..1260b053bf25 100644
--- a/trunk/net/tipc/core.h
+++ b/trunk/net/tipc/core.h
@@ -168,16 +168,6 @@ extern void tipc_netlink_stop(void);
 extern int  tipc_socket_init(void);
 extern void tipc_socket_stop(void);
 
-static inline int delimit(int val, int min, int max)
-{
-	if (val > max)
-		return max;
-	if (val < min)
-		return min;
-	return val;
-}
-
-
 /*
  * TIPC timer and signal code
  */
diff --git a/trunk/net/tipc/log.c b/trunk/net/tipc/log.c
index 952c39f643e6..895c6e530b0b 100644
--- a/trunk/net/tipc/log.c
+++ b/trunk/net/tipc/log.c
@@ -304,7 +304,7 @@ struct sk_buff *tipc_log_resize_cmd(const void *req_tlv_area, int req_tlv_space)
 		return tipc_cfg_reply_error_string(TIPC_CFG_TLV_ERROR);
 
 	value = ntohl(*(__be32 *)TLV_DATA(req_tlv_area));
-	if (value != delimit(value, 0, 32768))
+	if (value > 32768)
 		return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
 						   " (log size must be 0-32768)");
 	if (tipc_log_resize(value))