aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-24 01:55:45 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-24 02:08:47 -0500
commit33765d06033cc4ba4d9ae6d3d606ef3f28773c1b (patch)
tree339157eaabfc9659b264754a55b7e663c87658f7
parent1f673c5fe2eca9007e60d82186473aa94090ea4c (diff)
xfrm: Const'ify xfrm_address_t args to xfrm_state_find.
This required a const'ification in xfrm_init_tempstate() too. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/xfrm.h4
-rw-r--r--net/xfrm/xfrm_state.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 3205e5e4379f..44dccfcf9204 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1334,8 +1334,8 @@ extern int xfrm_state_walk(struct net *net, struct xfrm_state_walk *walk,
1334 int (*func)(struct xfrm_state *, int, void*), void *); 1334 int (*func)(struct xfrm_state *, int, void*), void *);
1335extern void xfrm_state_walk_done(struct xfrm_state_walk *walk); 1335extern void xfrm_state_walk_done(struct xfrm_state_walk *walk);
1336extern struct xfrm_state *xfrm_state_alloc(struct net *net); 1336extern struct xfrm_state *xfrm_state_alloc(struct net *net);
1337extern struct xfrm_state *xfrm_state_find(xfrm_address_t *daddr, 1337extern struct xfrm_state *xfrm_state_find(const xfrm_address_t *daddr,
1338 xfrm_address_t *saddr, 1338 const xfrm_address_t *saddr,
1339 const struct flowi *fl, 1339 const struct flowi *fl,
1340 struct xfrm_tmpl *tmpl, 1340 struct xfrm_tmpl *tmpl,
1341 struct xfrm_policy *pol, int *err, 1341 struct xfrm_policy *pol, int *err,
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 9d9ac7ca3dd4..8496b3d3e85b 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -659,7 +659,7 @@ EXPORT_SYMBOL(xfrm_sad_getinfo);
659static int 659static int
660xfrm_init_tempstate(struct xfrm_state *x, const struct flowi *fl, 660xfrm_init_tempstate(struct xfrm_state *x, const struct flowi *fl,
661 const struct xfrm_tmpl *tmpl, 661 const struct xfrm_tmpl *tmpl,
662 xfrm_address_t *daddr, xfrm_address_t *saddr, 662 const xfrm_address_t *daddr, const xfrm_address_t *saddr,
663 unsigned short family) 663 unsigned short family)
664{ 664{
665 struct xfrm_state_afinfo *afinfo = xfrm_state_get_afinfo(family); 665 struct xfrm_state_afinfo *afinfo = xfrm_state_get_afinfo(family);
@@ -790,7 +790,7 @@ static void xfrm_state_look_at(struct xfrm_policy *pol, struct xfrm_state *x,
790} 790}
791 791
792struct xfrm_state * 792struct xfrm_state *
793xfrm_state_find(xfrm_address_t *daddr, xfrm_address_t *saddr, 793xfrm_state_find(const xfrm_address_t *daddr, const xfrm_address_t *saddr,
794 const struct flowi *fl, struct xfrm_tmpl *tmpl, 794 const struct flowi *fl, struct xfrm_tmpl *tmpl,
795 struct xfrm_policy *pol, int *err, 795 struct xfrm_policy *pol, int *err,
796 unsigned short family) 796 unsigned short family)