aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-09-27 21:48:33 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-28 21:02:41 -0400
commit61f4627b2fecce9d5c9645e4b47e75a0c29ad8c3 (patch)
tree56eceeeb96291a2fe0f3f5f1ff34de31bf2ec605
parenta252cc2371930debe3162f1ac91467b9791324cb (diff)
[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.h2
-rw-r--r--net/xfrm/xfrm_state.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index e6110559e505..1e2a4ddec96e 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);
936extern int xfrm_state_delete(struct xfrm_state *x); 936extern int xfrm_state_delete(struct xfrm_state *x);
937extern void xfrm_state_flush(u8 proto); 937extern void xfrm_state_flush(u8 proto);
938extern int xfrm_replay_check(struct xfrm_state *x, __be32 seq); 938extern int xfrm_replay_check(struct xfrm_state *x, __be32 seq);
939extern void xfrm_replay_advance(struct xfrm_state *x, u32 seq); 939extern void xfrm_replay_advance(struct xfrm_state *x, __be32 seq);
940extern void xfrm_replay_notify(struct xfrm_state *x, int event); 940extern void xfrm_replay_notify(struct xfrm_state *x, int event);
941extern int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb); 941extern int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb);
942extern int xfrm_state_mtu(struct xfrm_state *x, int mtu); 942extern 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 33e982961db0..25657f57fbb0 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)
1205} 1205}
1206EXPORT_SYMBOL(xfrm_replay_check); 1206EXPORT_SYMBOL(xfrm_replay_check);
1207 1207
1208void xfrm_replay_advance(struct xfrm_state *x, u32 seq) 1208void xfrm_replay_advance(struct xfrm_state *x, __be32 net_seq)
1209{ 1209{
1210 u32 diff; 1210 u32 diff;
1211 1211 u32 seq = ntohl(net_seq);
1212 seq = ntohl(seq);
1213 1212
1214 if (seq > x->replay.seq) { 1213 if (seq > x->replay.seq) {
1215 diff = seq - x->replay.seq; 1214 diff = seq - x->replay.seq;