diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-22 20:51:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-22 20:51:44 -0500 |
commit | 73e5ebb20f2809e2eb0b904448481e010c2599d7 (patch) | |
tree | b41c044d23f9b488ac45d743cf1a0c9e9e90ca79 | |
parent | 0c7b3eefb4ab8df245e94feb0d83c1c3450a3d87 (diff) |
xfrm: Mark flowi arg to ->init_tempsel() const.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/xfrm.h | 3 | ||||
-rw-r--r-- | net/ipv4/xfrm4_state.c | 2 | ||||
-rw-r--r-- | net/ipv6/xfrm6_state.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index c77407fdfa87..614c296c4532 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -300,7 +300,8 @@ struct xfrm_state_afinfo { | |||
300 | const struct xfrm_type *type_map[IPPROTO_MAX]; | 300 | const struct xfrm_type *type_map[IPPROTO_MAX]; |
301 | struct xfrm_mode *mode_map[XFRM_MODE_MAX]; | 301 | struct xfrm_mode *mode_map[XFRM_MODE_MAX]; |
302 | int (*init_flags)(struct xfrm_state *x); | 302 | int (*init_flags)(struct xfrm_state *x); |
303 | void (*init_tempsel)(struct xfrm_selector *sel, struct flowi *fl); | 303 | void (*init_tempsel)(struct xfrm_selector *sel, |
304 | const struct flowi *fl); | ||
304 | void (*init_temprop)(struct xfrm_state *x, struct xfrm_tmpl *tmpl, | 305 | void (*init_temprop)(struct xfrm_state *x, struct xfrm_tmpl *tmpl, |
305 | xfrm_address_t *daddr, xfrm_address_t *saddr); | 306 | xfrm_address_t *daddr, xfrm_address_t *saddr); |
306 | int (*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n); | 307 | int (*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n); |
diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c index 47947624eccc..19eb56067727 100644 --- a/net/ipv4/xfrm4_state.c +++ b/net/ipv4/xfrm4_state.c | |||
@@ -21,7 +21,7 @@ static int xfrm4_init_flags(struct xfrm_state *x) | |||
21 | } | 21 | } |
22 | 22 | ||
23 | static void | 23 | static void |
24 | __xfrm4_init_tempsel(struct xfrm_selector *sel, struct flowi *fl) | 24 | __xfrm4_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl) |
25 | { | 25 | { |
26 | sel->daddr.a4 = fl->fl4_dst; | 26 | sel->daddr.a4 = fl->fl4_dst; |
27 | sel->saddr.a4 = fl->fl4_src; | 27 | sel->saddr.a4 = fl->fl4_src; |
diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c index a67575d472a3..68a14c0339db 100644 --- a/net/ipv6/xfrm6_state.c +++ b/net/ipv6/xfrm6_state.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <net/addrconf.h> | 20 | #include <net/addrconf.h> |
21 | 21 | ||
22 | static void | 22 | static void |
23 | __xfrm6_init_tempsel(struct xfrm_selector *sel, struct flowi *fl) | 23 | __xfrm6_init_tempsel(struct xfrm_selector *sel, const struct flowi *fl) |
24 | { | 24 | { |
25 | /* Initialize temporary selector matching only | 25 | /* Initialize temporary selector matching only |
26 | * to current session. */ | 26 | * to current session. */ |