Merge tag 'please-pull-misc-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / net / core / dst.c

diff --git a/net/core/dst.c b/net/core/dst.c
index a028409ee438c27d738deb1b065269a441a0f5f3..e956ce6d13782f2da0a229cabafef663665159eb 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -327,30 +327,6 @@ void __dst_destroy_metrics_generic(struct dst_entry *dst, unsigned long old)
 }
 EXPORT_SYMBOL(__dst_destroy_metrics_generic);
 
-/**
- * __skb_dst_set_noref - sets skb dst, without a reference
- * @skb: buffer
- * @dst: dst entry
- * @force: if force is set, use noref version even for DST_NOCACHE entries
- *
- * Sets skb dst, assuming a reference was not taken on dst
- * skb_dst_drop() should not dst_release() this dst
- */
-void __skb_dst_set_noref(struct sk_buff *skb, struct dst_entry *dst, bool force)
-{
-       WARN_ON(!rcu_read_lock_held() && !rcu_read_lock_bh_held());
-       /* If dst not in cache, we must take a reference, because
-        * dst_release() will destroy dst as soon as its refcount becomes zero
-        */
-       if (unlikely((dst->flags & DST_NOCACHE) && !force)) {
-               dst_hold(dst);
-               skb_dst_set(skb, dst);
-       } else {
-               skb->_skb_refdst = (unsigned long)dst | SKB_DST_NOREF;
-       }
-}
-EXPORT_SYMBOL(__skb_dst_set_noref);
-
 /* Dirty hack. We did it in 2.2 (in __dst_free),
  * we have _very_ good reasons not to repeat
  * this mistake in 2.3, but we have no choice