From patchwork Tue May 25 10:29:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archie Pusaka X-Patchwork-Id: 12278421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31B08C2B9F8 for ; Tue, 25 May 2021 10:31:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13567610FC for ; Tue, 25 May 2021 10:31:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232224AbhEYKcw (ORCPT ); Tue, 25 May 2021 06:32:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231889AbhEYKcR (ORCPT ); Tue, 25 May 2021 06:32:17 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76F61C06135A for ; Tue, 25 May 2021 03:30:15 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id z3-20020a17090a4683b029015f6c19f126so10617548pjf.1 for ; Tue, 25 May 2021 03:30:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=y6YaFo9xMSyv5si5BVZOxww4rwo4OSsWWh5xilxnc1g=; b=QmCvf6vxSJmUaWr07r2Af0WtkWFbXQSxFR51Ok5fioSUZgOmtzctE/dZ7X8q1KdRmJ ATu1C+hF2yXKUKBt0hzYNfKcKXYe5tT8tQFX625um6lPYW/+RxboQHA5Sy4M8II2ElNV v+fb16/ZN+sfsFGwRFz8X+wuiB+StUq9rOCpIKsZx8KZhG2+PeVZ9zANkwPFgQYrT5Co r9bce3xqn9NO/4lvWH0cJeMk838LS0IrRP34srMl1/m3LXCIqGpUx6A3H1n0fXVUmP/h s/FhWd/dhQPYQ133A/FkRhe6DfN5A0uQEsITpsadLBpVc5XV06PywhqSkrrrkZDvxQ5z JgOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=y6YaFo9xMSyv5si5BVZOxww4rwo4OSsWWh5xilxnc1g=; b=MdVA1HlRjzr8Pf3GGeLdHfdc3NaGZHtuG3k+pRyVqU6duIuXFXaVlpj7s5r12RRwVX OmjFa2LqdvzdCc+ljwJJlDPPvYLxoh5jYdOCgXGCIFFId0ySz7qWsA7LYH2/jP/+tWy4 43chN5dpqXl3GJXs/tz7/XWjbaHt4u66CnGh3E2ZSRlF2TH6T7BkVTYrUFe9dWRdfitY S/B5HNtqwEAJNfJbipe/XKHP81mZeoW1CRoD2mD2GQVT3IJXsKEXajrdJdK36VoReRWo MbJcK5Kb+tmm2wZWl9qhCJV7drofVIlf6PW7/4PX9Gj36Tdj/4IJMfCM6Lv61sfGocMj Bpug== X-Gm-Message-State: AOAM531/ogVixod6dh3Vnpvgk28ZylVk9O/k9XM1neqhsje7dk2gxSUc 10Vj0L2o1ul2hG7t4EdPdMsVf6yLAwvrHVoK3jBmVUWFByjEOd1tn6JUZiZkgYNvZQPfzqJOK4O o6daxi5fPL3J1451a0CAgkYUjWqx6bE4cOPfDNrHh3SNvtOsDnx17z8fGkavqNvcO82dL+0jz7O Ul X-Google-Smtp-Source: ABdhPJxAvsMZeTF3Sxy/Sq7R2QI1AMCtxljQX5HNv8dIrJeXEru+uiJB2OkZ0Uw2basdV7EtW/cu1q+pzdRv X-Received: from apusaka-p920.tpe.corp.google.com ([2401:fa00:1:b:8806:6b98:8ae6:8824]) (user=apusaka job=sendgmr) by 2002:a17:90b:90c:: with SMTP id bo12mr30044645pjb.10.1621938614725; Tue, 25 May 2021 03:30:14 -0700 (PDT) Date: Tue, 25 May 2021 18:29:35 +0800 In-Reply-To: <20210525102941.3958649-1-apusaka@google.com> Message-Id: <20210525182900.6.Id35872ce1572f18e0792e6f4d70721132e97a480@changeid> Mime-Version: 1.0 References: <20210525102941.3958649-1-apusaka@google.com> X-Mailer: git-send-email 2.31.1.818.g46aad6cb9e-goog Subject: [PATCH 06/12] Bluetooth: use inclusive language in RFCOMM From: Archie Pusaka To: linux-bluetooth , Marcel Holtmann Cc: CrosBT Upstreaming , Archie Pusaka , Miao-chen Chou , "David S. Miller" , "Gustavo A. R. Silva" , Jakub Kicinski , Johan Hedberg , Luiz Augusto von Dentz , Matthieu Baerts , Sebastian Andrzej Siewior , Stefan Schmidt , linux-kernel@vger.kernel.org, netdev@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Archie Pusaka Use "central" and "peripheral". Signed-off-by: Archie Pusaka Reviewed-by: Miao-chen Chou --- include/net/bluetooth/rfcomm.h | 2 +- net/bluetooth/rfcomm/sock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h index 99d26879b02a..6472ec0053b9 100644 --- a/include/net/bluetooth/rfcomm.h +++ b/include/net/bluetooth/rfcomm.h @@ -290,7 +290,7 @@ struct rfcomm_conninfo { }; #define RFCOMM_LM 0x03 -#define RFCOMM_LM_MASTER 0x0001 +#define RFCOMM_LM_CENTRAL 0x0001 #define RFCOMM_LM_AUTH 0x0002 #define RFCOMM_LM_ENCRYPT 0x0004 #define RFCOMM_LM_TRUSTED 0x0008 diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index ae6f80730561..b02d0e8a7030 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -674,7 +674,7 @@ static int rfcomm_sock_setsockopt_old(struct socket *sock, int optname, if (opt & RFCOMM_LM_SECURE) rfcomm_pi(sk)->sec_level = BT_SECURITY_HIGH; - rfcomm_pi(sk)->role_switch = (opt & RFCOMM_LM_MASTER); + rfcomm_pi(sk)->role_switch = (opt & RFCOMM_LM_CENTRAL); break; default: @@ -794,7 +794,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u } if (rfcomm_pi(sk)->role_switch) - opt |= RFCOMM_LM_MASTER; + opt |= RFCOMM_LM_CENTRAL; if (put_user(opt, (u32 __user *) optval)) err = -EFAULT;