Merge branch 'for-3.7' into next

[firefly-linux-kernel-4.4.55.git] / include / net / dst.h

diff --git a/include/net/dst.h b/include/net/dst.h
index 31a9fd39edb6b10fc283e1a8680dc3f63e3dbfee..baf59789006427bc7c373449b62b271e6e777d15 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -61,7 +61,6 @@ struct dst_entry {
 #define DST_NOPEER             0x0040
 #define DST_FAKE_RTABLE                0x0080
 #define DST_XFRM_TUNNEL                0x0100
-#define DST_RCU_FREE           0x0200
 
        unsigned short          pending_confirm;
 
@@ -383,6 +382,12 @@ static inline void dst_free(struct dst_entry *dst)
        __dst_free(dst);
 }
 
+static inline void dst_rcu_free(struct rcu_head *head)
+{
+       struct dst_entry *dst = container_of(head, struct dst_entry, rcu_head);
+       dst_free(dst);
+}
+
 static inline void dst_confirm(struct dst_entry *dst)
 {
        dst->pending_confirm = 1;