[IPSEC]: Move output replay code into xfrm_output

The replay counter is one of only two remaining things in the output code
that requires a lock on the xfrm state (the other being the crypto).  This
patch moves it into the generic xfrm_output so we can remove the lock from
the transforms themselves.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 4 deletions

diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 69a2030407b..ae68a900f60 100644
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -283,8 +283,7 @@ static int ah6_output(struct xfrm_state *x, struct sk_buff *skb)
 
         ah->reserved = 0;
         ah->spi = x->id.spi;
-        ah->seq_no = htonl(++x->replay.oseq);
-        xfrm_aevent_doreplay(x);
+        ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq);
         err = ah_mac_digest(ahp, skb, ah->auth_data);
         if (err)
                 goto error_free_iph;
@@ -506,6 +505,7 @@ static struct xfrm_type ah6_type =
         .description    = "AH6",
         .owner          = THIS_MODULE,
         .proto          = IPPROTO_AH,
+        .flags          = XFRM_TYPE_REPLAY_PROT,
         .init_state     = ah6_init_state,
         .destructor     = ah6_destroy,
         .input          = ah6_input,
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 77281068d0f..0c5fb81451b 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -95,8 +95,7 @@ static int esp6_output(struct xfrm_state *x, struct sk_buff *skb)
         *skb_network_header(skb) = IPPROTO_ESP;
 
         esph->spi = x->id.spi;
-        esph->seq_no = htonl(++x->replay.oseq);
-        xfrm_aevent_doreplay(x);
+        esph->seq_no = htonl(XFRM_SKB_CB(skb)->seq);
 
         if (esp->conf.ivlen) {
                 if (unlikely(!esp->conf.ivinitted)) {
@@ -373,6 +372,7 @@ static struct xfrm_type esp6_type =
         .description    = "ESP6",
         .owner          = THIS_MODULE,
         .proto          = IPPROTO_ESP,
+        .flags          = XFRM_TYPE_REPLAY_PROT,
         .init_state     = esp6_init_state,
         .destructor     = esp6_destroy,
         .get_mtu        = esp6_get_mtu,