Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[mv-sheeva.git] / net / xfrm / xfrm_output.c

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 64f2ae1fdc15e2a63a28fc7073fc0e1f957cee44..1aba03f449cc889098fc33710692e0c1b1518c3c 100644 (file)
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -67,17 +67,10 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
                        goto error;
                }
 
-               if (x->type->flags & XFRM_TYPE_REPLAY_PROT) {
-                       XFRM_SKB_CB(skb)->seq.output = ++x->replay.oseq;
-                       if (unlikely(x->replay.oseq == 0)) {
-                               XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATESEQERROR);
-                               x->replay.oseq--;
-                               xfrm_audit_state_replay_overflow(x, skb);
-                               err = -EOVERFLOW;
-                               goto error;
-                       }
-                       if (xfrm_aevent_is_on(net))
-                               xfrm_replay_notify(x, XFRM_REPLAY_UPDATE);
+               err = x->repl->overflow(x, skb);
+               if (err) {
+                       XFRM_INC_STATS(net, LINUX_MIB_XFRMOUTSTATESEQERROR);
+                       goto error;
                }
 
                x->curlft.bytes += skb->len;