netlink: rename netlink_unbind() to netlink_undo_bind()
authorJohannes Berg <johannes.berg@intel.com>
Mon, 22 Dec 2014 17:56:35 +0000 (18:56 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sat, 27 Dec 2014 07:20:23 +0000 (02:20 -0500)
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>
net/netlink/af_netlink.c

index 074cf3e91c6f2d5cb27ff7599f42d5b6c0ee1fd4..b4cf8ee0e1b804e84caff00ccd301cab2849af39 100644 (file)
@@ -1410,8 +1410,8 @@ static int netlink_realloc_groups(struct sock *sk)
        return err;
 }
 
-static void netlink_unbind(int group, long unsigned int groups,
-                          struct netlink_sock *nlk)
+static void netlink_undo_bind(int group, long unsigned int groups,
+                             struct netlink_sock *nlk)
 {
        int undo;
 
@@ -1461,7 +1461,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
                        err = nlk->netlink_bind(group);
                        if (!err)
                                continue;
-                       netlink_unbind(group, groups, nlk);
+                       netlink_undo_bind(group, groups, nlk);
                        return err;
                }
        }
@@ -1471,7 +1471,7 @@ static int netlink_bind(struct socket *sock, struct sockaddr *addr,
                        netlink_insert(sk, net, nladdr->nl_pid) :
                        netlink_autobind(sock);
                if (err) {
-                       netlink_unbind(nlk->ngroups, groups, nlk);
+                       netlink_undo_bind(nlk->ngroups, groups, nlk);
                        return err;
                }
        }