aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-22 20:48:57 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-22 20:48:57 -0500
commit0c7b3eefb4ab8df245e94feb0d83c1c3450a3d87 (patch)
tree895c8242220a1bbbdf0704bba009fb3a424af316
parent05d8402576c9c1b85bfc9e4f9d6a21c27ccbd5b1 (diff)
xfrm: Mark flowi arg to ->fill_dst() const.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/xfrm.h2
-rw-r--r--net/ipv4/xfrm4_policy.c2
-rw-r--r--net/ipv6/xfrm6_policy.c2
-rw-r--r--net/xfrm/xfrm_policy.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 2c0927b04436..c77407fdfa87 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -279,7 +279,7 @@ struct xfrm_policy_afinfo {
279 int nfheader_len); 279 int nfheader_len);
280 int (*fill_dst)(struct xfrm_dst *xdst, 280 int (*fill_dst)(struct xfrm_dst *xdst,
281 struct net_device *dev, 281 struct net_device *dev,
282 struct flowi *fl); 282 const struct flowi *fl);
283}; 283};
284 284
285extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo); 285extern int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index ef12e6830468..1e9844d1f8c5 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -68,7 +68,7 @@ static int xfrm4_init_path(struct xfrm_dst *path, struct dst_entry *dst,
68} 68}
69 69
70static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, 70static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
71 struct flowi *fl) 71 const struct flowi *fl)
72{ 72{
73 struct rtable *rt = (struct rtable *)xdst->route; 73 struct rtable *rt = (struct rtable *)xdst->route;
74 74
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 753e9a1db379..f2fa904b8a91 100644
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -87,7 +87,7 @@ static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst,
87} 87}
88 88
89static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, 89static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
90 struct flowi *fl) 90 const struct flowi *fl)
91{ 91{
92 struct rt6_info *rt = (struct rt6_info*)xdst->route; 92 struct rt6_info *rt = (struct rt6_info*)xdst->route;
93 93
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index f8ccb97b234e..fa0b7f33874b 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1369,7 +1369,7 @@ static inline int xfrm_init_path(struct xfrm_dst *path, struct dst_entry *dst,
1369} 1369}
1370 1370
1371static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, 1371static inline int xfrm_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
1372 struct flowi *fl) 1372 const struct flowi *fl)
1373{ 1373{
1374 struct xfrm_policy_afinfo *afinfo = 1374 struct xfrm_policy_afinfo *afinfo =
1375 xfrm_policy_get_afinfo(xdst->u.dst.ops->family); 1375 xfrm_policy_get_afinfo(xdst->u.dst.ops->family);