diff options
author | Johannes Berg <johannes.berg@intel.com> | 2014-12-22 12:56:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-27 02:20:23 -0500 |
commit | 02c81ab95d8718d75886d16227a10cc7774493ea (patch) | |
tree | 4c03dde22711619ce2b2b1b302d0df942f4a5d2d /net/netlink | |
parent | eb46e2215fc6bdaaf8eda3a6c7c0dd033d171cad (diff) |
netlink: rename netlink_unbind() to netlink_undo_bind()
The new name is more expressive - this isn't a generic unbind
function but rather only a little undo helper for use only in
netlink_bind().
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
-rw-r--r-- | net/netlink/af_netlink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 074cf3e91c6f..b4cf8ee0e1b8 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
@@ -1410,8 +1410,8 @@ static int netlink_realloc_groups(struct sock *sk) | |||
1410 | return err; | 1410 | return err; |
1411 | } | 1411 | } |
1412 | 1412 | ||
1413 | static void netlink_unbind(int group, long unsigned int groups, | 1413 | static void netlink_undo_bind(int group, long unsigned int groups, |
1414 | struct netlink_sock *nlk) | 1414 | struct netlink_sock *nlk) |
1415 | { | 1415 | { |
1416 | int undo; | 1416 | int undo; |
1417 | 1417 | ||
@@ -1461,7 +1461,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr, | |||
1461 | err = nlk->netlink_bind(group); | 1461 | err = nlk->netlink_bind(group); |
1462 | if (!err) | 1462 | if (!err) |
1463 | continue; | 1463 | continue; |
1464 | netlink_unbind(group, groups, nlk); | 1464 | netlink_undo_bind(group, groups, nlk); |
1465 | return err; | 1465 | return err; |
1466 | } | 1466 | } |
1467 | } | 1467 | } |
@@ -1471,7 +1471,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr, | |||
1471 | netlink_insert(sk, net, nladdr->nl_pid) : | 1471 | netlink_insert(sk, net, nladdr->nl_pid) : |
1472 | netlink_autobind(sock); | 1472 | netlink_autobind(sock); |
1473 | if (err) { | 1473 | if (err) { |
1474 | netlink_unbind(nlk->ngroups, groups, nlk); | 1474 | netlink_undo_bind(nlk->ngroups, groups, nlk); |
1475 | return err; | 1475 | return err; |
1476 | } | 1476 | } |
1477 | } | 1477 | } |