diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-15 10:27:06 -0400 |
| commit | 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 (patch) | |
| tree | e20283fe2ed46aa35c8ca5fc1724ba067cd2e2f8 /net/ipv4/tcp_minisocks.c | |
| parent | 3f17522ce461a31e7ced6311b28fcf5b8a763316 (diff) | |
| parent | 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6
Diffstat (limited to 'net/ipv4/tcp_minisocks.c')
| -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 f206ee5dda80..4199bc6915c5 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c | |||
| @@ -728,7 +728,7 @@ int tcp_child_process(struct sock *parent, struct sock *child, | |||
| 728 | * in main socket hash table and lock on listening | 728 | * in main socket hash table and lock on listening |
| 729 | * socket does not protect us more. | 729 | * socket does not protect us more. |
| 730 | */ | 730 | */ |
| 731 | sk_add_backlog(child, skb); | 731 | __sk_add_backlog(child, skb); |
| 732 | } | 732 | } |
| 733 | 733 | ||
| 734 | bh_unlock_sock(child); | 734 | bh_unlock_sock(child); |