diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 17:27:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 17:27:01 -0800 |
| commit | fb7d4045669b3ea0e92cf45963839a9808b7650c (patch) | |
| tree | 4f8f2598bf27dd5ff2a096a3cb40ad83f9796c97 /net/ipv4 | |
| parent | 100b425480d3a4c7dff4f99bead457d91ad19caf (diff) | |
| parent | a9948a7e15015e7f2cb602190322b8ebb00c54c8 (diff) | |
| download | linux-fb7d4045669b3ea0e92cf45963839a9808b7650c.tar.gz linux-fb7d4045669b3ea0e92cf45963839a9808b7650c.tar.bz2 linux-fb7d4045669b3ea0e92cf45963839a9808b7650c.zip | |
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:
[TCP]: Fix minisock tcp_create_openreq_child() typo.
[TCP]: Document several sysctls.
[NET]: Fix kfree(skb)
[NET]: Handle disabled preemption in gfp_any()
[BRIDGE]: Fix locking of set path cost.
[IPV6]: /proc/net/anycast6 unbalanced inet6_dev refcnt
[IPX]: Remove ancient changelog
[IPX]: Remove outdated information from Kconfig
[NET]: Revert socket.h/stat.h ifdef hacks.
[IPV6]: anycast refcnt fix
[XFRM] xfrm_user: Fix return values of xfrm_add_sa_expire.
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_minisocks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 30b1e520ad94..6b5c64f3c925 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c @@ -381,7 +381,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req, if (newsk != NULL) { const struct inet_request_sock *ireq = inet_rsk(req); struct tcp_request_sock *treq = tcp_rsk(req); - struct inet_connection_sock *newicsk = inet_csk(sk); + struct inet_connection_sock *newicsk = inet_csk(newsk); struct tcp_sock *newtp; /* Now setup tcp_sock */ |