Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux

[cascardo/linux.git] / include / net / dst_ops.h

diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h
index 3682a0a..2f26dfb 100644 (file)
--- a/include/net/dst_ops.h
+++ b/include/net/dst_ops.h
@@ -8,6 +8,7 @@ struct dst_entry;
 struct kmem_cachep;
 struct net_device;
 struct sk_buff;
+struct sock;
 
 struct dst_ops {
        unsigned short          family;
@@ -24,9 +25,14 @@ struct dst_ops {
                                          struct net_device *dev, int how);
        struct dst_entry *      (*negative_advice)(struct dst_entry *);
        void                    (*link_failure)(struct sk_buff *);
-       void                    (*update_pmtu)(struct dst_entry *dst, u32 mtu);
+       void                    (*update_pmtu)(struct dst_entry *dst, struct sock *sk,
+                                              struct sk_buff *skb, u32 mtu);
+       void                    (*redirect)(struct dst_entry *dst, struct sock *sk,
+                                           struct sk_buff *skb);
        int                     (*local_out)(struct sk_buff *skb);
-       struct neighbour *      (*neigh_lookup)(const struct dst_entry *dst, const void *daddr);
+       struct neighbour *      (*neigh_lookup)(const struct dst_entry *dst,
+                                               struct sk_buff *skb,
+                                               const void *daddr);
 
        struct kmem_cache       *kmem_cachep;