From 316f6967c00c7284c8dde18c60f2c4304dfdbe1f Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 8 Oct 2007 17:26:34 -0700
Subject: [PATCH] --- yaml --- r: 66949 b: refs/heads/master c:
 cdf7e668d4327a33e11be04c4cb9bcc604eaaa0f h: refs/heads/master i:   66947:
 9c86707441b07d655faeb2037a47e2d179af6bab v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/xfrm.h     | 6 ------
 trunk/net/xfrm/xfrm_output.c | 3 ++-
 trunk/net/xfrm/xfrm_state.c  | 1 -
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 6b908637601f..6e87bc82fa16 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 436a0a402203d5a47d2edf7e4dde6c08a7257983
+refs/heads/master: cdf7e668d4327a33e11be04c4cb9bcc604eaaa0f
diff --git a/trunk/include/net/xfrm.h b/trunk/include/net/xfrm.h
index a267725f9753..064a4ca63476 100644
--- a/trunk/include/net/xfrm.h
+++ b/trunk/include/net/xfrm.h
@@ -1163,12 +1163,6 @@ static inline int xfrm_aevent_is_on(void)
 	return ret;
 }
 
-static inline void xfrm_aevent_doreplay(struct xfrm_state *x)
-{
-	if (xfrm_aevent_is_on())
-		xfrm_replay_notify(x, XFRM_REPLAY_UPDATE);
-}
-
 #ifdef CONFIG_XFRM_MIGRATE
 static inline struct xfrm_algo *xfrm_algo_clone(struct xfrm_algo *orig)
 {
diff --git a/trunk/net/xfrm/xfrm_output.c b/trunk/net/xfrm/xfrm_output.c
index 20e789d8c63e..40d75eccddda 100644
--- a/trunk/net/xfrm/xfrm_output.c
+++ b/trunk/net/xfrm/xfrm_output.c
@@ -60,7 +60,8 @@ int xfrm_output(struct sk_buff *skb)
 
 		if (x->type->flags & XFRM_TYPE_REPLAY_PROT) {
 			XFRM_SKB_CB(skb)->seq = ++x->replay.oseq;
-			xfrm_aevent_doreplay(x);
+			if (xfrm_aevent_is_on())
+				xfrm_replay_notify(x, XFRM_REPLAY_UPDATE);
 		}
 
 		err = x->mode->output(x, skb);
diff --git a/trunk/net/xfrm/xfrm_state.c b/trunk/net/xfrm/xfrm_state.c
index 0ecec34d265a..a00745abaad3 100644
--- a/trunk/net/xfrm/xfrm_state.c
+++ b/trunk/net/xfrm/xfrm_state.c
@@ -1397,7 +1397,6 @@ void xfrm_replay_notify(struct xfrm_state *x, int event)
 	    !mod_timer(&x->rtimer, jiffies + x->replay_maxage))
 		x->xflags &= ~XFRM_TIME_DEFER;
 }
-EXPORT_SYMBOL(xfrm_replay_notify);
 
 static void xfrm_replay_timer_handler(unsigned long data)
 {