diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-09-27 18:48:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-09-28 18:02:41 -0700 |
| commit | 61f4627b2fecce9d5c9645e4b47e75a0c29ad8c3 (patch) | |
| tree | 56eceeeb96291a2fe0f3f5f1ff34de31bf2ec605 | |
| parent | a252cc2371930debe3162f1ac91467b9791324cb (diff) | |
| download | op-kernel-dev-61f4627b2fecce9d5c9645e4b47e75a0c29ad8c3.zip op-kernel-dev-61f4627b2fecce9d5c9645e4b47e75a0c29ad8c3.tar.gz | |
[XFRM]: xfrm_replay_advance() annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/xfrm.h | 2 | ||||
| -rw-r--r-- | net/xfrm/xfrm_state.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index e611055..1e2a4dd 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -936,7 +936,7 @@ extern struct xfrm_state *xfrm_find_acq_byseq(u32 seq); extern int xfrm_state_delete(struct xfrm_state *x); extern void xfrm_state_flush(u8 proto); extern int xfrm_replay_check(struct xfrm_state *x, __be32 seq); -extern void xfrm_replay_advance(struct xfrm_state *x, u32 seq); +extern void xfrm_replay_advance(struct xfrm_state *x, __be32 seq); extern void xfrm_replay_notify(struct xfrm_state *x, int event); extern int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb); extern int xfrm_state_mtu(struct xfrm_state *x, int mtu); diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 33e9829..25657f5 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c @@ -1205,11 +1205,10 @@ int xfrm_replay_check(struct xfrm_state *x, __be32 net_seq) } EXPORT_SYMBOL(xfrm_replay_check); -void xfrm_replay_advance(struct xfrm_state *x, u32 seq) +void xfrm_replay_advance(struct xfrm_state *x, __be32 net_seq) { u32 diff; - - seq = ntohl(seq); + u32 seq = ntohl(net_seq); if (seq > x->replay.seq) { diff = seq - x->replay.seq; |
