| Message ID | 20131022041124.GA14122@will |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
From: ZHAO Gang <gamerh2o@gmail.com> Date: Tue, 22 Oct 2013 12:11:24 +0800 > 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> Still doesn't apply. Email this patch to yourself, I bet the patch you receive won't apply cleanly. Likely your email client is corrupting the patch. You've already eaten enough of my time as a maintainer submitting a patch that won't even apply. Absolutely do not resubmit this patch until you can email the patch successfully to yourself and successfuly apply the patch you receive in that email to the current net-next tree. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/net/sock.h b/include/net/sock.h index 1d37a80..db66682 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1752,8 +1752,6 @@ sk_dst_get(struct sock *sk) return dst; } -extern 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); @@ -1763,7 +1761,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 5b6beba..3f1545f 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);
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> --- include/net/sock.h | 4 +--- net/core/sock.c | 6 ------ 2 files changed, 1 insertion(+), 9 deletions(-)