From 20f61a15b4fcaf5f86f11a1e82aa8e3442c375c9 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Tue, 11 May 2010 14:30:11 +0000
Subject: [PATCH] --- yaml --- r: 195027 b: refs/heads/master c:
 01fee256a675f6492fc6945bbb9b59640d8705d4 h: refs/heads/master i:   195025:
 751ac3e084a68d9a31fcf7b9b9eec6546d3a8bf7   195023:
 fdd9c944104ffcb5cc4caf88fb4efc6afd5da56b v: v3

---
 [refs]                    |  2 +-
 trunk/net/tipc/discover.c |  2 +-
 trunk/net/tipc/link.c     | 30 ------------------------------
 trunk/net/tipc/link.h     | 35 +++++++++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/[refs] b/[refs]
index 47f8c0a7b651..903eb2fc6279 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15e979da7c9ddddd55d2eb81e962dbb2aac51ad1
+refs/heads/master: 01fee256a675f6492fc6945bbb9b59640d8705d4
diff --git a/trunk/net/tipc/discover.c b/trunk/net/tipc/discover.c
index 74b7d1e28aec..ce1390a0cd00 100644
--- a/trunk/net/tipc/discover.c
+++ b/trunk/net/tipc/discover.c
@@ -224,7 +224,7 @@ void tipc_disc_recv_msg(struct sk_buff *buf, struct bearer *b_ptr)
 			memcpy(addr, &media_addr, sizeof(*addr));
 			tipc_link_reset(link);
 		}
-		link_fully_up = (link->state == WORKING_WORKING);
+		link_fully_up = link_working_working(link);
 		spin_unlock_bh(&n_ptr->lock);
 		if ((type == DSC_RESP_MSG) || link_fully_up)
 			return;
diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c
index 441b26a57850..e8320bf78d5a 100644
--- a/trunk/net/tipc/link.c
+++ b/trunk/net/tipc/link.c
@@ -202,36 +202,6 @@ static unsigned int align(unsigned int i)
 	return (i + 3) & ~3u;
 }
 
-static int link_working_working(struct link *l_ptr)
-{
-	return (l_ptr->state == WORKING_WORKING);
-}
-
-static int link_working_unknown(struct link *l_ptr)
-{
-	return (l_ptr->state == WORKING_UNKNOWN);
-}
-
-static int link_reset_unknown(struct link *l_ptr)
-{
-	return (l_ptr->state == RESET_UNKNOWN);
-}
-
-static int link_reset_reset(struct link *l_ptr)
-{
-	return (l_ptr->state == RESET_RESET);
-}
-
-static int link_blocked(struct link *l_ptr)
-{
-	return (l_ptr->exp_msg_count || l_ptr->blocked);
-}
-
-static int link_congested(struct link *l_ptr)
-{
-	return (l_ptr->out_queue_size >= l_ptr->queue_limit[0]);
-}
-
 static void link_init_max_pkt(struct link *l_ptr)
 {
 	u32 max_pkt;
diff --git a/trunk/net/tipc/link.h b/trunk/net/tipc/link.h
index 6a51e38ad25c..2e5385c47d30 100644
--- a/trunk/net/tipc/link.h
+++ b/trunk/net/tipc/link.h
@@ -292,4 +292,39 @@ static inline u32 lesser(u32 left, u32 right)
 	return less_eq(left, right) ? left : right;
 }
 
+
+/*
+ * Link status checking routines
+ */
+
+static inline int link_working_working(struct link *l_ptr)
+{
+	return (l_ptr->state == WORKING_WORKING);
+}
+
+static inline int link_working_unknown(struct link *l_ptr)
+{
+	return (l_ptr->state == WORKING_UNKNOWN);
+}
+
+static inline int link_reset_unknown(struct link *l_ptr)
+{
+	return (l_ptr->state == RESET_UNKNOWN);
+}
+
+static inline int link_reset_reset(struct link *l_ptr)
+{
+	return (l_ptr->state == RESET_RESET);
+}
+
+static inline int link_blocked(struct link *l_ptr)
+{
+	return (l_ptr->exp_msg_count || l_ptr->blocked);
+}
+
+static inline int link_congested(struct link *l_ptr)
+{
+	return (l_ptr->out_queue_size >= l_ptr->queue_limit[0]);
+}
+
 #endif