diff options
-rw-r--r-- | include/net/xfrm.h | 6 | ||||
-rw-r--r-- | net/xfrm/xfrm_output.c | 3 | ||||
-rw-r--r-- | net/xfrm/xfrm_state.c | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index a267725f9753..064a4ca63476 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -1163,12 +1163,6 @@ static inline int xfrm_aevent_is_on(void) | |||
1163 | return ret; | 1163 | return ret; |
1164 | } | 1164 | } |
1165 | 1165 | ||
1166 | static inline void xfrm_aevent_doreplay(struct xfrm_state *x) | ||
1167 | { | ||
1168 | if (xfrm_aevent_is_on()) | ||
1169 | xfrm_replay_notify(x, XFRM_REPLAY_UPDATE); | ||
1170 | } | ||
1171 | |||
1172 | #ifdef CONFIG_XFRM_MIGRATE | 1166 | #ifdef CONFIG_XFRM_MIGRATE |
1173 | static inline struct xfrm_algo *xfrm_algo_clone(struct xfrm_algo *orig) | 1167 | static inline struct xfrm_algo *xfrm_algo_clone(struct xfrm_algo *orig) |
1174 | { | 1168 | { |
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 20e789d8c63e..40d75eccddda 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c | |||
@@ -60,7 +60,8 @@ int xfrm_output(struct sk_buff *skb) | |||
60 | 60 | ||
61 | if (x->type->flags & XFRM_TYPE_REPLAY_PROT) { | 61 | if (x->type->flags & XFRM_TYPE_REPLAY_PROT) { |
62 | XFRM_SKB_CB(skb)->seq = ++x->replay.oseq; | 62 | XFRM_SKB_CB(skb)->seq = ++x->replay.oseq; |
63 | xfrm_aevent_doreplay(x); | 63 | if (xfrm_aevent_is_on()) |
64 | xfrm_replay_notify(x, XFRM_REPLAY_UPDATE); | ||
64 | } | 65 | } |
65 | 66 | ||
66 | err = x->mode->output(x, skb); | 67 | err = x->mode->output(x, skb); |
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 0ecec34d265a..a00745abaad3 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -1397,7 +1397,6 @@ void xfrm_replay_notify(struct xfrm_state *x, int event) | |||
1397 | !mod_timer(&x->rtimer, jiffies + x->replay_maxage)) | 1397 | !mod_timer(&x->rtimer, jiffies + x->replay_maxage)) |
1398 | x->xflags &= ~XFRM_TIME_DEFER; | 1398 | x->xflags &= ~XFRM_TIME_DEFER; |
1399 | } | 1399 | } |
1400 | EXPORT_SYMBOL(xfrm_replay_notify); | ||
1401 | 1400 | ||
1402 | static void xfrm_replay_timer_handler(unsigned long data) | 1401 | static void xfrm_replay_timer_handler(unsigned long data) |
1403 | { | 1402 | { |