diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-22 20:47:10 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-22 20:47:10 -0500 |
commit | 05d8402576c9c1b85bfc9e4f9d6a21c27ccbd5b1 (patch) | |
tree | d3406de85a12ae45b75ef109bd8e991b119f55b9 | |
parent | e8a4e37716dbc964e1cd18bca1a62fbd11805c1d (diff) |
xfrm: Mark flowi arg to ->get_tos() const.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/xfrm.h | 2 | ||||
-rw-r--r-- | net/ipv4/xfrm4_policy.c | 2 | ||||
-rw-r--r-- | net/ipv6/xfrm6_policy.c | 2 | ||||
-rw-r--r-- | net/xfrm/xfrm_policy.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 2de3dae3d297..2c0927b04436 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -273,7 +273,7 @@ struct xfrm_policy_afinfo { | |||
273 | void (*decode_session)(struct sk_buff *skb, | 273 | void (*decode_session)(struct sk_buff *skb, |
274 | struct flowi *fl, | 274 | struct flowi *fl, |
275 | int reverse); | 275 | int reverse); |
276 | int (*get_tos)(struct flowi *fl); | 276 | int (*get_tos)(const struct flowi *fl); |
277 | int (*init_path)(struct xfrm_dst *path, | 277 | int (*init_path)(struct xfrm_dst *path, |
278 | struct dst_entry *dst, | 278 | struct dst_entry *dst, |
279 | int nfheader_len); | 279 | int nfheader_len); |
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index 19fbdec6baaa..ef12e6830468 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c | |||
@@ -56,7 +56,7 @@ static int xfrm4_get_saddr(struct net *net, | |||
56 | return 0; | 56 | return 0; |
57 | } | 57 | } |
58 | 58 | ||
59 | static int xfrm4_get_tos(struct flowi *fl) | 59 | static int xfrm4_get_tos(const struct flowi *fl) |
60 | { | 60 | { |
61 | return IPTOS_RT_MASK & fl->fl4_tos; /* Strip ECN bits */ | 61 | return IPTOS_RT_MASK & fl->fl4_tos; /* Strip ECN bits */ |
62 | } | 62 | } |
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 834dc02f1d4f..753e9a1db379 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
@@ -67,7 +67,7 @@ static int xfrm6_get_saddr(struct net *net, | |||
67 | return 0; | 67 | return 0; |
68 | } | 68 | } |
69 | 69 | ||
70 | static int xfrm6_get_tos(struct flowi *fl) | 70 | static int xfrm6_get_tos(const struct flowi *fl) |
71 | { | 71 | { |
72 | return 0; | 72 | return 0; |
73 | } | 73 | } |
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 7a8e2c77d08f..f8ccb97b234e 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -1256,7 +1256,7 @@ xfrm_tmpl_resolve(struct xfrm_policy **pols, int npols, struct flowi *fl, | |||
1256 | * still valid. | 1256 | * still valid. |
1257 | */ | 1257 | */ |
1258 | 1258 | ||
1259 | static inline int xfrm_get_tos(struct flowi *fl, int family) | 1259 | static inline int xfrm_get_tos(const struct flowi *fl, int family) |
1260 | { | 1260 | { |
1261 | struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family); | 1261 | struct xfrm_policy_afinfo *afinfo = xfrm_policy_get_afinfo(family); |
1262 | int tos; | 1262 | int tos; |