From: Eric Dumazet <eric.dumazet@xxxxxxxxx> Date: Wed, 24 Apr 2013 18:34:55 -0700 > From: Eric Dumazet <edumazet@xxxxxxxxxx> ... > Thanks for the report, here is a fix. > > It will be a bit of a hassle to merge this one on net-next, as > tcp_prequeue() was moved in commit > b2fb4f54ecd47c42413d54b4666b06cf93c05abf > (tcp: uninline tcp_prequeue() ) > > David, maybe you prefer to pull into net tree the move, then I respin > the fix ? > > [PATCH] tcp: force a dst refcount when prequeue packet I'll apply this to 'net', since you've explained the complict I now know how to resolve this when I next merge into 'net-next'. Stephen, there is a bug fix going into 'net' for tcp_prequeue() however in 'net-next' tcp_prequeue() has simply moved from one place to another. The merge resolution is to simple move the new skb_dst_force() call to the new location. -- To unsubscribe from this list: send the line "unsubscribe linux-rt-users" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
