[XFRM]: Add packet processing statistics option.

[powerpc.git] / net / xfrm / xfrm_output.c

diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index 048d240..867484a 100644 (file)
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -33,16 +33,6 @@ static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb)
        return 0;
 }
 
-static int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb)
-{
-       int err = xfrm_state_check_expire(x);
-       if (err < 0)
-               goto err;
-       err = xfrm_state_check_space(x, skb);
-err:
-       return err;
-}
-
 static int xfrm_output_one(struct sk_buff *skb, int err)
 {
        struct dst_entry *dst = skb->dst;
@@ -52,12 +42,16 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
                goto resume;
 
        do {
+               err = xfrm_state_check_space(x, skb);
+               if (err)
+                       goto error_nolock;
+
                err = x->outer_mode->output(x, skb);
                if (err)
-                       goto error;
+                       goto error_nolock;
 
                spin_lock_bh(&x->lock);
-               err = xfrm_state_check(x, skb);
+               err = xfrm_state_check_expire(x);
                if (err)
                        goto error;
 
@@ -75,10 +69,13 @@ static int xfrm_output_one(struct sk_buff *skb, int err)
                err = x->type->output(x, skb);
 
 resume:
-               if (err)
+               if (err) {
+                       XFRM_INC_STATS(LINUX_MIB_XFRMOUTSTATEPROTOERROR);
                        goto error_nolock;
+               }
 
                if (!(skb->dst = dst_pop(dst))) {
+                       XFRM_INC_STATS(LINUX_MIB_XFRMOUTERROR);
                        err = -EHOSTUNREACH;
                        goto error_nolock;
                }
@@ -113,7 +110,7 @@ int xfrm_output_resume(struct sk_buff *skb, int err)
                        return dst_output(skb);
 
                err = nf_hook(x->inner_mode->afinfo->family,
-                             x->inner_mode->afinfo->nf_post_routing, skb,
+                             NF_INET_POST_ROUTING, skb,
                              NULL, skb->dst->dev, xfrm_output2);
                if (unlikely(err != 1))
                        goto out;
@@ -173,6 +170,7 @@ int xfrm_output(struct sk_buff *skb)
        if (skb->ip_summed == CHECKSUM_PARTIAL) {
                err = skb_checksum_help(skb);
                if (err) {
+                       XFRM_INC_STATS(LINUX_MIB_XFRMOUTERROR);
                        kfree_skb(skb);
                        return err;
                }