diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-30 03:50:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-30 03:55:20 -0400 |
| commit | 58717686cf7c7f5a70b3a8907ade8a3ce74306b1 (patch) | |
| tree | 57f5d78524bfd5e65aa9f3943da9c1a3e6ff65b7 /net/ipv4 | |
| parent | cff63a52924c6a78fa525c67d81480c85736ff3c (diff) | |
| parent | 79f632c71bea0d0864d84d6a4ce78da5a9430f5b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/emulex/benet/be.h
include/net/tcp.h
net/mac802154/mac802154.h
Most conflicts were minor overlapping stuff.
The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 8ea975164596..d979657b8a12 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -1927,6 +1927,7 @@ bool tcp_prequeue(struct sock *sk, struct sk_buff *skb) | |||
| 1927 | skb_queue_len(&tp->ucopy.prequeue) == 0) | 1927 | skb_queue_len(&tp->ucopy.prequeue) == 0) |
| 1928 | return false; | 1928 | return false; |
| 1929 | 1929 | ||
| 1930 | skb_dst_force(skb); | ||
| 1930 | __skb_queue_tail(&tp->ucopy.prequeue, skb); | 1931 | __skb_queue_tail(&tp->ucopy.prequeue, skb); |
| 1931 | tp->ucopy.memory += skb->truesize; | 1932 | tp->ucopy.memory += skb->truesize; |
| 1932 | if (tp->ucopy.memory > sk->sk_rcvbuf) { | 1933 | if (tp->ucopy.memory > sk->sk_rcvbuf) { |