diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-21 18:41:46 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-21 18:41:46 -0800 |
| commit | 656edac6784181fccdab97cc8a59127ea6b08910 (patch) | |
| tree | 4920c464aba555430904d4b93936a72a391016c7 /net/sctp/protocol.c | |
| parent | d08f161a10006491d5835702bff2a12c91fb0cdd (diff) | |
| parent | 5bc1d1b4a261a865cbde65b1561748df5b9c724b (diff) | |
| download | linux-656edac6784181fccdab97cc8a59127ea6b08910.tar.bz2 | |
Merge branch 'sctp'
Wang Weidong says:
====================
sctp: remove some macro locking wrappers
In sctp.h we can find some macro locking wrappers. As Neil point out that:
"Its because in the origional implementation of the sctp protocol, there was a
user space test harness which built the kernel module for userspace execution to
cary our some unit testing on the code. It did so by redefining some of those
locking macros to user space friendly code. IIRC we haven't use those unit
tests in years, and so should be removing them, not adding them to other
locations."
So I remove them.
====================
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/protocol.c')
| -rw-r--r-- | net/sctp/protocol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index d6934dc8dcb6..4e1d0fcb028e 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c @@ -634,10 +634,10 @@ static void sctp_addr_wq_timeout_handler(unsigned long arg) /* ignore bound-specific endpoints */ if (!sctp_is_ep_boundall(sk)) continue; - sctp_bh_lock_sock(sk); + bh_lock_sock(sk); if (sctp_asconf_mgmt(sp, addrw) < 0) pr_debug("%s: sctp_asconf_mgmt failed\n", __func__); - sctp_bh_unlock_sock(sk); + bh_unlock_sock(sk); } #if IS_ENABLED(CONFIG_IPV6) free_next: |