aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorZHAO Gang <gamerh2o@gmail.com>2013-10-22 04:23:38 -0400
committerDavid S. Miller <davem@davemloft.net>2013-10-22 14:00:21 -0400
commit0a6957e7d47096bbeedda4e1d926359eb487dcfc (patch)
tree4e780bf47cde19ad48dda7bd108221c60d8544e7 /include
parent1a0176da63438f3643a65adb370abf11760ffba9 (diff)
net: remove function sk_reset_txq()
What sk_reset_txq() does is just calls function sk_tx_queue_reset(), and sk_reset_txq() is used only in sock.h, by dst_negative_advice(). Let dst_negative_advice() calls sk_tx_queue_reset() directly so we can remove unneeded sk_reset_txq(). Signed-off-by: ZHAO Gang <gamerh2o@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/sock.h4
1 files changed, 1 insertions, 3 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}