projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
[cascardo/linux.git]
/
net
/
sctp
/
protocol.c
diff --git
a/net/sctp/protocol.c
b/net/sctp/protocol.c
index
5942d27
..
9c90811
100644
(file)
--- 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);
}
SCTP_DEBUG_PRINTK("sctp_addrwq_timo_handler: sctp_asconf_mgmt failed\n");
sctp_bh_unlock_sock(sk);
}
+#if IS_ENABLED(CONFIG_IPV6)
free_next:
free_next:
+#endif
list_del(&addrw->list);
kfree(addrw);
}
list_del(&addrw->list);
kfree(addrw);
}