aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/xfrm.h3
-rw-r--r--net/ipv6/mip6.c3
-rw-r--r--net/xfrm/xfrm_policy.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 614c296c4532..cbe00035416d 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -334,7 +334,8 @@ struct xfrm_type {
334 void (*destructor)(struct xfrm_state *); 334 void (*destructor)(struct xfrm_state *);
335 int (*input)(struct xfrm_state *, struct sk_buff *skb); 335 int (*input)(struct xfrm_state *, struct sk_buff *skb);
336 int (*output)(struct xfrm_state *, struct sk_buff *pskb); 336 int (*output)(struct xfrm_state *, struct sk_buff *pskb);
337 int (*reject)(struct xfrm_state *, struct sk_buff *, struct flowi *); 337 int (*reject)(struct xfrm_state *, struct sk_buff *,
338 const struct flowi *);
338 int (*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **); 339 int (*hdr_offset)(struct xfrm_state *, struct sk_buff *, u8 **);
339 /* Estimate maximal size of result of transformation of a dgram */ 340 /* Estimate maximal size of result of transformation of a dgram */
340 u32 (*get_mtu)(struct xfrm_state *, int size); 341 u32 (*get_mtu)(struct xfrm_state *, int size);
diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c
index d6e9599d0705..f3e3ca938a54 100644
--- a/net/ipv6/mip6.c
+++ b/net/ipv6/mip6.c
@@ -203,7 +203,8 @@ static inline int mip6_report_rl_allow(struct timeval *stamp,
203 return allow; 203 return allow;
204} 204}
205 205
206static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb, struct flowi *fl) 206static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb,
207 const struct flowi *fl)
207{ 208{
208 struct net *net = xs_net(x); 209 struct net *net = xs_net(x);
209 struct inet6_skb_parm *opt = (struct inet6_skb_parm *)skb->cb; 210 struct inet6_skb_parm *opt = (struct inet6_skb_parm *)skb->cb;
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index fa0b7f33874b..ccd47cf1765c 100644
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -1907,7 +1907,7 @@ int xfrm_lookup(struct net *net, struct dst_entry **dst_p, struct flowi *fl,
1907EXPORT_SYMBOL(xfrm_lookup); 1907EXPORT_SYMBOL(xfrm_lookup);
1908 1908
1909static inline int 1909static inline int
1910xfrm_secpath_reject(int idx, struct sk_buff *skb, struct flowi *fl) 1910xfrm_secpath_reject(int idx, struct sk_buff *skb, const struct flowi *fl)
1911{ 1911{
1912 struct xfrm_state *x; 1912 struct xfrm_state *x;
1913 1913