Sync mach-omap2/irq.c with mainline

[linux-2.6-omap-h63xx.git] / net / ipv6 / ah6.c

diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
index 2d32772c87c3f9913a7a7f5bd8ebd8f63f820f66..2ff0c8233e47a0096e5670aaa3e41d80d7e3f6a3 100644 (file)
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@@ -283,7 +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(XFRM_SKB_CB(skb)->seq);
+       ah->seq_no = htonl(XFRM_SKB_CB(skb)->seq.output);
 
        spin_lock_bh(&x->lock);
        err = ah_mac_digest(ahp, skb, ah->auth_data);
@@ -380,10 +380,8 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb)
                err = ah_mac_digest(ahp, skb, ah->auth_data);
                if (err)
                        goto unlock;
-               if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) {
-                       xfrm_audit_state_icvfail(x, skb, IPPROTO_AH);
+               if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len))
                        err = -EBADMSG;
-               }
        }
 unlock:
        spin_unlock(&x->lock);
@@ -517,7 +515,7 @@ static void ah6_destroy(struct xfrm_state *x)
        kfree(ahp);
 }
 
-static struct xfrm_type ah6_type =
+static const struct xfrm_type ah6_type =
 {
        .description    = "AH6",
        .owner          = THIS_MODULE,