summaryrefslogtreecommitdiff
path: root/include/net/sock.h
diff options
context:
space:
mode:
authorZHAO Gang <gamerh2o@gmail.com>2013-10-22 16:23:38 +0800
committerDavid S. Miller <davem@davemloft.net>2013-10-22 14:00:21 -0400
commit0a6957e7d47096bbeedda4e1d926359eb487dcfc (patch)
tree4e780bf47cde19ad48dda7bd108221c60d8544e7 /include/net/sock.h
parent1a0176da63438f3643a65adb370abf11760ffba9 (diff)
downloadlinux-stable-0a6957e7d47096bbeedda4e1d926359eb487dcfc.tar.gz
linux-stable-0a6957e7d47096bbeedda4e1d926359eb487dcfc.tar.bz2
linux-stable-0a6957e7d47096bbeedda4e1d926359eb487dcfc.zip
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/net/sock.h')
-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)
return dst;
}
-void sk_reset_txq(struct sock *sk);
-
static inline void dst_negative_advice(struct sock *sk)
{
struct dst_entry *ndst, *dst = __sk_dst_get(sk);
@@ -1757,7 +1755,7 @@ static inline void dst_negative_advice(struct sock *sk)
if (ndst != dst) {
rcu_assign_pointer(sk->sk_dst_cache, ndst);
- sk_reset_txq(sk);
+ sk_tx_queue_clear(sk);
}
}
}