projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull cpu-hotplug into release branch
[powerpc.git]
/
net
/
ipv4
/
ah4.c
diff --git
a/net/ipv4/ah4.c
b/net/ipv4/ah4.c
index
035ad2c
..
e2e4771
100644
(file)
--- a/
net/ipv4/ah4.c
+++ b/
net/ipv4/ah4.c
@@
-6,6
+6,7
@@
#include <linux/crypto.h>
#include <linux/pfkeyv2.h>
#include <net/icmp.h>
#include <linux/crypto.h>
#include <linux/pfkeyv2.h>
#include <net/icmp.h>
+#include <net/protocol.h>
#include <asm/scatterlist.h>
#include <asm/scatterlist.h>
@@
-96,6
+97,7
@@
static int ah_output(struct xfrm_state *x, struct sk_buff *skb)
ah->reserved = 0;
ah->spi = x->id.spi;
ah->seq_no = htonl(++x->replay.oseq);
ah->reserved = 0;
ah->spi = x->id.spi;
ah->seq_no = htonl(++x->replay.oseq);
+ xfrm_aevent_doreplay(x);
ahp->icv(ahp, skb, ah->auth_data);
top_iph->tos = iph->tos;
ahp->icv(ahp, skb, ah->auth_data);
top_iph->tos = iph->tos;
@@
-114,7
+116,7
@@
error:
return err;
}
return err;
}
-static int ah_input(struct xfrm_state *x, struct
xfrm_decap_state *decap, struct
sk_buff *skb)
+static int ah_input(struct xfrm_state *x, struct sk_buff *skb)
{
int ah_hlen;
struct iphdr *iph;
{
int ah_hlen;
struct iphdr *iph;