Hi all,
Today's linux-next merge of the net-next tree got a conflict in
include/net/tcp.h between commit 093162553c33 ("tcp: force a dst refcount
when prequeue packet") from the net tree and commit b2fb4f54ecd4 ("tcp:
uninline tcp_prequeue()") from the net-next tree.I fixed it up (I used the next-next version of tcp.h and added the following patch) and can carry the fix as necessary (no action is required). Thanks for the heads up Dave! From: Stephen Rothwell <[email protected]> Date: Fri, 26 Apr 2013 13:35:50 +1000 Subject: [PATCH] tcp: merge fixup for movemenet of tcp_prequeue Signed-off-by: Stephen Rothwell <[email protected]> --- net/ipv4/tcp_ipv4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 8667aaa..5dcf177 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1926,6 +1926,7 @@ bool tcp_prequeue(struct sock *sk, struct sk_buff *skb) skb_queue_len(&tp->ucopy.prequeue) == 0) return false; + skb_dst_force(skb); __skb_queue_tail(&tp->ucopy.prequeue, skb); tp->ucopy.memory += skb->truesize; if (tp->ucopy.memory > sk->sk_rcvbuf) { -- 1.8.1 -- Cheers, Stephen Rothwell [email protected]
pgpyIhsBxGBsv.pgp
Description: PGP signature
