aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/sock.h4
-rw-r--r--net/core/sock.c6
2 files changed, 1 insertions, 9 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 86bb0668c581..c93542f92420 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1746,8 +1746,6 @@ sk_dst_get(struct sock *sk)
1746 return dst; 1746 return dst;
1747} 1747}
1748 1748
1749void sk_reset_txq(struct sock *sk);
1750
1751static inline void dst_negative_advice(struct sock *sk) 1749static inline void dst_negative_advice(struct sock *sk)
1752{ 1750{
1753 struct dst_entry *ndst, *dst = __sk_dst_get(sk); 1751 struct dst_entry *ndst, *dst = __sk_dst_get(sk);
@@ -1757,7 +1755,7 @@ static inline void dst_negative_advice(struct sock *sk)
1757 1755
1758 if (ndst != dst) { 1756 if (ndst != dst) {
1759 rcu_assign_pointer(sk->sk_dst_cache, ndst); 1757 rcu_assign_pointer(sk->sk_dst_cache, ndst);
1760 sk_reset_txq(sk); 1758 sk_tx_queue_clear(sk);
1761 } 1759 }
1762 } 1760 }
1763} 1761}
diff --git a/net/core/sock.c b/net/core/sock.c
index 440afdca1e8f..ab20ed9b0f31 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -475,12 +475,6 @@ discard_and_relse:
475} 475}
476EXPORT_SYMBOL(sk_receive_skb); 476EXPORT_SYMBOL(sk_receive_skb);
477 477
478void sk_reset_txq(struct sock *sk)
479{
480 sk_tx_queue_clear(sk);
481}
482EXPORT_SYMBOL(sk_reset_txq);
483
484struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie) 478struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
485{ 479{
486 struct dst_entry *dst = __sk_dst_get(sk); 480 struct dst_entry *dst = __sk_dst_get(sk);