diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 11:17:26 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 11:17:26 +0000 |
| commit | f9b44121b34174ae4f243a568393fc3225842e75 (patch) | |
| tree | 943f68cd7458d08a9e8809ed0a10b71b23911f3e /net/dccp/minisocks.c | |
| parent | 8727b909bb2348d29e62c599cd7a5d610da3760f (diff) | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
| download | linux-3.10-f9b44121b34174ae4f243a568393fc3225842e75.tar.gz linux-3.10-f9b44121b34174ae4f243a568393fc3225842e75.tar.bz2 linux-3.10-f9b44121b34174ae4f243a568393fc3225842e75.zip | |
Merge commit 'v2.6.34-rc2' into for-2.6.34
Diffstat (limited to 'net/dccp/minisocks.c')
| -rw-r--r-- | net/dccp/minisocks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index af226a06314..0d508c359fa 100644 --- a/net/dccp/minisocks.c +++ b/net/dccp/minisocks.c @@ -254,7 +254,7 @@ int dccp_child_process(struct sock *parent, struct sock *child, * in main socket hash table and lock on listening * socket does not protect us more. */ - sk_add_backlog(child, skb); + __sk_add_backlog(child, skb); } bh_unlock_sock(child); |