diff options
| author | Ingo Molnar <[email protected]> | 2012-07-11 07:41:37 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2012-07-11 07:41:37 +0000 |
| commit | 92254d31444aad272155f7963e65910c402703dd (patch) | |
| tree | 8e454ebe60cbac9a71b1771d4e471cfe54826963 /net/sctp/protocol.c | |
| parent | Merge tag 'amd-thresholding-fixes-for-3.6' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | Linux 3.5-rc6 (diff) | |
| download | kernel-92254d31444aad272155f7963e65910c402703dd.tar.gz kernel-92254d31444aad272155f7963e65910c402703dd.zip | |
Merge tag 'v3.5-rc6' into x86/mce
Merge Linux 3.5-rc6 before merging more code.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'net/sctp/protocol.c')
| -rw-r--r-- | net/sctp/protocol.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 5942d27b1444..9c90811d1134 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -673,7 +673,9 @@ void sctp_addr_wq_timeout_handler(unsigned long arg) SCTP_DEBUG_PRINTK("sctp_addrwq_timo_handler: sctp_asconf_mgmt failed\n"); sctp_bh_unlock_sock(sk); } +#if IS_ENABLED(CONFIG_IPV6) free_next: +#endif list_del(&addrw->list); kfree(addrw); } |