From ce78638178051c9f4ace7654681c6f75efba0890 Mon Sep 17 00:00:00 2001
From: Allan Stephens <allan.stephens@windriver.com>
Date: Thu, 7 Apr 2011 09:54:43 -0400
Subject: [PATCH] --- yaml --- r: 266100 b: refs/heads/master c:
 641c218d120b03bdea4f658ab44930587cff9158 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/tipc/link.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5256999b83fe..608ef46c0b10 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f882cb7684cf54d4f5d3e25443a80a039e1b4bd7
+refs/heads/master: 641c218d120b03bdea4f658ab44930587cff9158
diff --git a/trunk/net/tipc/link.c b/trunk/net/tipc/link.c
index e0bf6d5f1668..b43beea54108 100644
--- a/trunk/net/tipc/link.c
+++ b/trunk/net/tipc/link.c
@@ -2045,8 +2045,8 @@ static void link_recv_proto_msg(struct link *l_ptr, struct sk_buff *buf)
 	case RESET_MSG:
 		if (!link_working_unknown(l_ptr) &&
 		    (l_ptr->peer_session != INVALID_SESSION)) {
-			if (msg_session(msg) == l_ptr->peer_session)
-				break; /* duplicate: ignore */
+			if (less_eq(msg_session(msg), l_ptr->peer_session))
+				break; /* duplicate or old reset: ignore */
 		}
 		/* fall thru' */
 	case ACTIVATE_MSG: