Merge branch 'kcsan.2021.05.18a' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / net / bluetooth / hci_sock.c

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index eed0dd0..b04a5a0 100644 (file)
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -892,7 +892,7 @@ static int hci_sock_release(struct socket *sock)
        return 0;
 }
 
-static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg)
+static int hci_sock_reject_list_add(struct hci_dev *hdev, void __user *arg)
 {
        bdaddr_t bdaddr;
        int err;
@@ -902,14 +902,14 @@ static int hci_sock_blacklist_add(struct hci_dev *hdev, void __user *arg)
 
        hci_dev_lock(hdev);
 
-       err = hci_bdaddr_list_add(&hdev->blacklist, &bdaddr, BDADDR_BREDR);
+       err = hci_bdaddr_list_add(&hdev->reject_list, &bdaddr, BDADDR_BREDR);
 
        hci_dev_unlock(hdev);
 
        return err;
 }
 
-static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)
+static int hci_sock_reject_list_del(struct hci_dev *hdev, void __user *arg)
 {
        bdaddr_t bdaddr;
        int err;
@@ -919,7 +919,7 @@ static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)
 
        hci_dev_lock(hdev);
 
-       err = hci_bdaddr_list_del(&hdev->blacklist, &bdaddr, BDADDR_BREDR);
+       err = hci_bdaddr_list_del(&hdev->reject_list, &bdaddr, BDADDR_BREDR);
 
        hci_dev_unlock(hdev);
 
@@ -959,12 +959,12 @@ static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,
        case HCIBLOCKADDR:
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
-               return hci_sock_blacklist_add(hdev, (void __user *)arg);
+               return hci_sock_reject_list_add(hdev, (void __user *)arg);
 
        case HCIUNBLOCKADDR:
                if (!capable(CAP_NET_ADMIN))
                        return -EPERM;
-               return hci_sock_blacklist_del(hdev, (void __user *)arg);
+               return hci_sock_reject_list_del(hdev, (void __user *)arg);
        }
 
        return -ENOIOCTLCMD;
@@ -1130,7 +1130,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,
                if (!hci_sock_gen_cookie(sk)) {
                        /* In the case when a cookie has already been assigned,
                         * then there has been already an ioctl issued against
-                        * an unbound socket and with that triggerd an open
+                        * an unbound socket and with that triggered an open
                         * notification. Send a close notification first to
                         * allow the state transition to bounded.
                         */
@@ -1326,9 +1326,9 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr,
                if (hci_pi(sk)->channel == HCI_CHANNEL_CONTROL) {
                        if (!hci_sock_gen_cookie(sk)) {
                                /* In the case when a cookie has already been
-                                * assigned, this socket will transtion from
+                                * assigned, this socket will transition from
                                 * a raw socket into a control socket. To
-                                * allow for a clean transtion, send the
+                                * allow for a clean transition, send the
                                 * close notification first.
                                 */
                                skb = create_monitor_ctrl_close(sk);