diff options
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/route.c | 4 | ||||
| -rw-r--r-- | net/ipv6/xfrm6_policy.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index a429900d16aa..4004c5f0b8d7 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
| @@ -79,7 +79,7 @@ static struct dst_entry *ip6_negative_advice(struct dst_entry *); | |||
| 79 | static void ip6_dst_destroy(struct dst_entry *); | 79 | static void ip6_dst_destroy(struct dst_entry *); |
| 80 | static void ip6_dst_ifdown(struct dst_entry *, | 80 | static void ip6_dst_ifdown(struct dst_entry *, |
| 81 | struct net_device *dev, int how); | 81 | struct net_device *dev, int how); |
| 82 | static int ip6_dst_gc(void); | 82 | static int ip6_dst_gc(struct dst_ops *ops); |
| 83 | 83 | ||
| 84 | static int ip6_pkt_discard(struct sk_buff *skb); | 84 | static int ip6_pkt_discard(struct sk_buff *skb); |
| 85 | static int ip6_pkt_discard_out(struct sk_buff *skb); | 85 | static int ip6_pkt_discard_out(struct sk_buff *skb); |
| @@ -983,7 +983,7 @@ int ndisc_dst_gc(int *more) | |||
| 983 | return freed; | 983 | return freed; |
| 984 | } | 984 | } |
| 985 | 985 | ||
| 986 | static int ip6_dst_gc(void) | 986 | static int ip6_dst_gc(struct dst_ops *ops) |
| 987 | { | 987 | { |
| 988 | static unsigned expire = 30*HZ; | 988 | static unsigned expire = 30*HZ; |
| 989 | static unsigned long last_gc; | 989 | static unsigned long last_gc; |
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index cf373b46a1ba..c25a6b527fc4 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
| @@ -212,7 +212,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse) | |||
| 212 | } | 212 | } |
| 213 | } | 213 | } |
| 214 | 214 | ||
| 215 | static inline int xfrm6_garbage_collect(void) | 215 | static inline int xfrm6_garbage_collect(struct dst_ops *ops) |
| 216 | { | 216 | { |
| 217 | xfrm6_policy_afinfo.garbage_collect(); | 217 | xfrm6_policy_afinfo.garbage_collect(); |
| 218 | return (atomic_read(&xfrm6_dst_ops.entries) > xfrm6_dst_ops.gc_thresh*2); | 218 | return (atomic_read(&xfrm6_dst_ops.entries) > xfrm6_dst_ops.gc_thresh*2); |