From 18b4fcb2dfa8fd962383092c01d88c75814de4a9 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Wed, 20 Mar 2013 22:59:11 +0100
Subject: [PATCH] --- yaml --- r: 362023 b: refs/heads/master c:
 799ef90c55e692e096d8bd9e5871b95264b1e9ba h: refs/heads/master i:   362021:
 e00e5c11f857282058528002c49893ed803a2aa2   362019:
 8dab0ef55654d8d44dea64d6f60e371575547b38   362015:
 6518d352e13f632abd0ef17baaa235c0e4fba904 v: v3

---
 [refs]                       | 2 +-
 trunk/net/xfrm/xfrm_replay.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d00085a1e4a3..520777a51ef3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0017c0b57500606aab894cdb02fdf3380ddd60ee
+refs/heads/master: 799ef90c55e692e096d8bd9e5871b95264b1e9ba
diff --git a/trunk/net/xfrm/xfrm_replay.c b/trunk/net/xfrm/xfrm_replay.c
index a3906737f49e..8dafe6d3c6e4 100644
--- a/trunk/net/xfrm/xfrm_replay.c
+++ b/trunk/net/xfrm/xfrm_replay.c
@@ -359,14 +359,12 @@ static void xfrm_replay_notify_esn(struct xfrm_state *x, int event)
 		if (replay_esn->seq_hi == preplay_esn->seq_hi)
 			seq_diff = replay_esn->seq - preplay_esn->seq;
 		else
-			seq_diff = UINT_MAX - preplay_esn->seq
-				   + replay_esn->seq;
+			seq_diff = ~preplay_esn->seq + replay_esn->seq + 1;
 
 		if (replay_esn->oseq_hi == preplay_esn->oseq_hi)
 			oseq_diff = replay_esn->oseq - preplay_esn->oseq;
 		else
-			oseq_diff = UINT_MAX - preplay_esn->oseq
-				    + replay_esn->oseq;
+			oseq_diff = ~preplay_esn->oseq + replay_esn->oseq + 1;
 
 		if (seq_diff < x->replay_maxdiff &&
 		    oseq_diff < x->replay_maxdiff) {