diff options
| author | Krishna Kumar <krkumar2@in.ibm.com> | 2009-10-19 23:46:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-20 18:55:46 -0700 |
| commit | ea94ff3b55188df157a8740bdf3976a87563d705 (patch) | |
| tree | a124cd047f8ed18c27aace29eafd2b343575857a /include/net/dst.h | |
| parent | f04c8276248d3dd3e15a9a72f9711ba5e4069049 (diff) | |
| download | op-kernel-dev-ea94ff3b55188df157a8740bdf3976a87563d705.zip op-kernel-dev-ea94ff3b55188df157a8740bdf3976a87563d705.tar.gz | |
net: Fix for dst_negative_advice
dst_negative_advice() should check for changed dst and reset
sk_tx_queue_mapping accordingly. Pass sock to the callers of
dst_negative_advice.
(sk_reset_txq is defined just for use by dst_negative_advice. The
only way I could find to get around this is to move dst_negative_()
from dst.h to dst.c, include sock.h in dst.c, etc)
Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/dst.h')
| -rw-r--r-- | include/net/dst.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 5a900dd..720d906 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -222,11 +222,19 @@ static inline void dst_confirm(struct dst_entry *dst) neigh_confirm(dst->neighbour); } -static inline void dst_negative_advice(struct dst_entry **dst_p) +static inline void dst_negative_advice(struct dst_entry **dst_p, + struct sock *sk) { struct dst_entry * dst = *dst_p; - if (dst && dst->ops->negative_advice) + if (dst && dst->ops->negative_advice) { *dst_p = dst->ops->negative_advice(dst); + + if (dst != *dst_p) { + extern void sk_reset_txq(struct sock *sk); + + sk_reset_txq(sk); + } + } } static inline void dst_link_failure(struct sk_buff *skb) |
