diff options
| author | ZHAO Gang <gamerh2o@gmail.com> | 2013-10-22 16:23:38 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-10-22 14:00:21 -0400 |
| commit | 0a6957e7d47096bbeedda4e1d926359eb487dcfc (patch) | |
| tree | 4e780bf47cde19ad48dda7bd108221c60d8544e7 | |
| parent | 1a0176da63438f3643a65adb370abf11760ffba9 (diff) | |
| download | talos-op-linux-0a6957e7d47096bbeedda4e1d926359eb487dcfc.tar.gz talos-op-linux-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>
| -rw-r--r-- | include/net/sock.h | 4 | ||||
| -rw-r--r-- | net/core/sock.c | 6 |
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) 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); } } } 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: } EXPORT_SYMBOL(sk_receive_skb); -void sk_reset_txq(struct sock *sk) -{ - sk_tx_queue_clear(sk); -} -EXPORT_SYMBOL(sk_reset_txq); - struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie) { struct dst_entry *dst = __sk_dst_get(sk); |
