aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-22 21:44:31 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-22 21:44:31 -0500
commitdee9f4bceb5fd9dbfcc1567148fccdbf16d6a38a (patch)
tree4b88bec4650dbc539594ae5027d7a1e34c196c88 /include
parent4ca2e685114c55e6777022a46849795d2aa1d31a (diff)
net: Make flow cache paths use a const struct flowi.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/dst.h10
-rw-r--r--include/net/flow.h4
2 files changed, 8 insertions, 6 deletions
diff --git a/include/net/dst.h b/include/net/dst.h
index 23b564d3e110..4fedffd7c56f 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -428,20 +428,22 @@ enum {
428struct flowi; 428struct flowi;
429#ifndef CONFIG_XFRM 429#ifndef CONFIG_XFRM
430static inline int xfrm_lookup(struct net *net, struct dst_entry **dst_p, 430static inline int xfrm_lookup(struct net *net, struct dst_entry **dst_p,
431 struct flowi *fl, struct sock *sk, int flags) 431 const struct flowi *fl, struct sock *sk,
432 int flags)
432{ 433{
433 return 0; 434 return 0;
434} 435}
435static inline int __xfrm_lookup(struct net *net, struct dst_entry **dst_p, 436static inline int __xfrm_lookup(struct net *net, struct dst_entry **dst_p,
436 struct flowi *fl, struct sock *sk, int flags) 437 const struct flowi *fl, struct sock *sk,
438 int flags)
437{ 439{
438 return 0; 440 return 0;
439} 441}
440#else 442#else
441extern int xfrm_lookup(struct net *net, struct dst_entry **dst_p, 443extern int xfrm_lookup(struct net *net, struct dst_entry **dst_p,
442 struct flowi *fl, struct sock *sk, int flags); 444 const struct flowi *fl, struct sock *sk, int flags);
443extern int __xfrm_lookup(struct net *net, struct dst_entry **dst_p, 445extern int __xfrm_lookup(struct net *net, struct dst_entry **dst_p,
444 struct flowi *fl, struct sock *sk, int flags); 446 const struct flowi *fl, struct sock *sk, int flags);
445#endif 447#endif
446#endif 448#endif
447 449
diff --git a/include/net/flow.h b/include/net/flow.h
index f4270d4b22c3..f2080e65276d 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -102,11 +102,11 @@ struct flow_cache_ops {
102}; 102};
103 103
104typedef struct flow_cache_object *(*flow_resolve_t)( 104typedef struct flow_cache_object *(*flow_resolve_t)(
105 struct net *net, struct flowi *key, u16 family, 105 struct net *net, const struct flowi *key, u16 family,
106 u8 dir, struct flow_cache_object *oldobj, void *ctx); 106 u8 dir, struct flow_cache_object *oldobj, void *ctx);
107 107
108extern struct flow_cache_object *flow_cache_lookup( 108extern struct flow_cache_object *flow_cache_lookup(
109 struct net *net, struct flowi *key, u16 family, 109 struct net *net, const struct flowi *key, u16 family,
110 u8 dir, flow_resolve_t resolver, void *ctx); 110 u8 dir, flow_resolve_t resolver, void *ctx);
111 111
112extern void flow_cache_flush(void); 112extern void flow_cache_flush(void);