diff options
| author | Todd Poynor <toddpoynor@google.com> | 2012-11-01 13:36:34 -0700 |
|---|---|---|
| committer | Todd Poynor <toddpoynor@google.com> | 2012-11-01 13:36:34 -0700 |
| commit | 925d49abc38dcc7ef1cbfe125c6f0b2202ae3df3 (patch) | |
| tree | a56506710f0340db055191e3cf0a207699c1b849 /net/l2tp/l2tp_core.c | |
| parent | 834029ac9d0ad8dea4e6a21bc34877dc3740b9f4 (diff) | |
| parent | 27d0858dbcf199838b8c50a3e94d397bf326d986 (diff) | |
| download | kernel_samsung_tuna-925d49abc38dcc7ef1cbfe125c6f0b2202ae3df3.zip kernel_samsung_tuna-925d49abc38dcc7ef1cbfe125c6f0b2202ae3df3.tar.gz kernel_samsung_tuna-925d49abc38dcc7ef1cbfe125c6f0b2202ae3df3.tar.bz2 | |
Merge remote-tracking branch 'stable/linux-3.0.y' into android-3.0
Change-Id: I9685feb9277b450da10d78a455b3c0674d6cfe18
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Diffstat (limited to 'net/l2tp/l2tp_core.c')
| -rw-r--r-- | net/l2tp/l2tp_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 71c292e..6a3d680 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -1252,11 +1252,10 @@ static void l2tp_tunnel_free(struct l2tp_tunnel *tunnel) /* Remove from tunnel list */ spin_lock_bh(&pn->l2tp_tunnel_list_lock); list_del_rcu(&tunnel->list); + kfree_rcu(tunnel, rcu); spin_unlock_bh(&pn->l2tp_tunnel_list_lock); - synchronize_rcu(); atomic_dec(&l2tp_tunnel_count); - kfree(tunnel); } /* Create a socket for the tunnel, if one isn't set up by |