diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-26 23:18:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-26 23:18:49 -0400 |
| commit | 8dbc16033e35c7443cd56cb5ba308bb19cb7b469 (patch) | |
| tree | f849df3b657763ff401024a828e86b0b57af102c /net/ipv6/tcp_ipv6.c | |
| parent | 81a42d298d8bd1b96be4bd459494f25fdd99b594 (diff) | |
| parent | 80193aee18bc862e284ba18504f3a3e14706a997 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[DCCP]: Introduce dccp_rx_hist_find_entry
[DCCP]: Introduces follows48 function
[DCCP]: Update contact details and copyright
[DCCP]: Fix typo
[IPV6]: Segmentation offload not set correctly on TCP children
[CONNECTOR]: Add userspace example code into Documentation/connector/
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index b843a650be71..802a1a6b1037 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -944,7 +944,7 @@ static struct sock * tcp_v6_syn_recv_sock(struct sock *sk, struct sk_buff *skb, | |||
| 944 | * comment in that function for the gory details. -acme | 944 | * comment in that function for the gory details. -acme |
| 945 | */ | 945 | */ |
| 946 | 946 | ||
| 947 | sk->sk_gso_type = SKB_GSO_TCPV6; | 947 | newsk->sk_gso_type = SKB_GSO_TCPV6; |
| 948 | __ip6_dst_store(newsk, dst, NULL); | 948 | __ip6_dst_store(newsk, dst, NULL); |
| 949 | 949 | ||
| 950 | newtcp6sk = (struct tcp6_sock *)newsk; | 950 | newtcp6sk = (struct tcp6_sock *)newsk; |