Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3730873ybz; Mon, 4 May 2020 08:39:47 -0700 (PDT) X-Google-Smtp-Source: APiQypIHfdz+EbGbXqvYYrvFPwuGOU0kr+TeOp+IggouRXe8uD9T5RpaUZgf+FrmBJXpiO+NI5u/ X-Received: by 2002:a17:906:6c93:: with SMTP id s19mr14874723ejr.135.1588606787843; Mon, 04 May 2020 08:39:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588606787; cv=none; d=google.com; s=arc-20160816; b=KV7OV7Js6o1ZV9TTzEAgO/VHRc6yOMjIbdqz1nPvKtISwYj8Tl/N2Wdg08ZTrb82Et P8M5XT2I8u/HtK0tKU2DHyaULzdKOmI9S9NxKxQ/6ryKy7wzpI6eDrNdeO+wEj6arZq0 KA4YGP0WoPvEw65wMAwMzQHq4Phu0U4V/Ixs/uNjpizi+Y6lTkVy8/xwy8h9GA4op9dr 3XEDGmRfFtHgPBBYqSYBhQdYz0fnpCEbs2eu93NNad9K2rwWuxh2zF/WyQ/X8jJIqjme GHkm9/enOwpECjfrrwtXjOJ4Wk3q82vGQw25Uh4KAAVn34qXMG78FvvxLsJePIFSlArQ Unug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Wj9inrs9woMthizwL4NhhqaMGj+nRW3DDgayM3A6Xgg=; b=GN74NUH/f/1xBGNBav4adc1mUnSg4BnMuzDrHJ93hnQUVLnqDldtE/SDm3qaZn0mM6 TA/WQnabGtRzK88Prd1xwjzeHLDUWRqjL1NxCKK8LoOEP3LPvTceAVwx889VDJrwpCli nx2TCkfJWaOUExNc8bh5H743fJPGSKPkX4W6g5imVNxnAC05Rg8KD76xYcntAuVzH2m4 DkrwdPVvkrS+66zcClOpQRHyvM5hsC860Uf6ccdId0Sfrkgkcp0UgwECFIqX4nAY7DOP gSsisgs8awZ3gwST/9zIJcK+DLtJA695oZAOjMW3WU+Xcn7cLfBthYrLGb1chM6GCDAB dTag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=XVhHAQlR; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bc23si6808572edb.241.2020.05.04.08.39.20; Mon, 04 May 2020 08:39:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=XVhHAQlR; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728608AbgEDPgd (ORCPT + 99 others); Mon, 4 May 2020 11:36:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726641AbgEDPgd (ORCPT ); Mon, 4 May 2020 11:36:33 -0400 Received: from mail-vs1-xe43.google.com (mail-vs1-xe43.google.com [IPv6:2607:f8b0:4864:20::e43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31FD1C061A0E for ; Mon, 4 May 2020 08:36:31 -0700 (PDT) Received: by mail-vs1-xe43.google.com with SMTP id y185so11388406vsy.8 for ; Mon, 04 May 2020 08:36:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wj9inrs9woMthizwL4NhhqaMGj+nRW3DDgayM3A6Xgg=; b=XVhHAQlR1cbevO0dE9s4AZqUiztoPZ095/YPQZCJfgbAe2ofDgrIaOUPjTBR0hwOvK 5VD5nQZNFWrhtcI4uxAswt959ElYbpf18EsV2JMAnr80ZEIK2jvJ/Xi19yrLEZNTRp4J lZgn9TAkNJjR8bYlTcCvrSGogWPHr+5DulBN0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wj9inrs9woMthizwL4NhhqaMGj+nRW3DDgayM3A6Xgg=; b=ft/5o0olNaMHrDB7Dp8jYL8BQr9sfqeaMDJL0X6YIHjvptzvWSs9Ts4XkAoTTTO45o kgaj9dUmXpbIxfrxImAAkyQr8Cah69WyNAlrrCmENSTSzmfii55lr9Cqsh4xwnFuoZgA zDIzdLaFaAaovSh3FSS0FJG+4kf0WEc8iFwAIWA7+Le/3NOomeXiN3KYvszSuAywGwco X+hggdydsk0aTrovqmPHoYRcnMNKYRvbkSpDMFESCSbv/TzNdpGCjt80l6379raBksgW CYTmyBx1zYAC9b6GJd0XW6CdN41qpPMvbkziEJXBRTogh+2nD8jObHjV6HyJT3VlLzU/ TqmA== X-Gm-Message-State: AGi0PuZni/u89EHVtZM921IYyOdVLfIxyZotxbjo0aZ6RnpieuF+cL/4 KHJXBDKBsAd/Fgoaf4S2vAeYE4L/t9A= X-Received: by 2002:a67:eb17:: with SMTP id a23mr13114934vso.111.1588606590128; Mon, 04 May 2020 08:36:30 -0700 (PDT) Received: from alain.c.googlers.com.com (161.138.243.35.bc.googleusercontent.com. [35.243.138.161]) by smtp.gmail.com with ESMTPSA id b6sm1927726vkn.31.2020.05.04.08.36.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2020 08:36:29 -0700 (PDT) From: Alain Michaud To: linux-bluetooth@vger.kernel.org Cc: Alain Michaud Subject: [BlueZ PATCH v2] Fixing opcode definition order Date: Mon, 4 May 2020 15:36:26 +0000 Message-Id: <20200504153626.231603-1-alainm@chromium.org> X-Mailer: git-send-email 2.26.2.526.g744177e7f7-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Fixing what looks like a bad merge in the opcode order. Signed-off-by: Alain Michaud --- lib/mgmt.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/mgmt.h b/lib/mgmt.h index e46e08ba8..0722c5206 100644 --- a/lib/mgmt.h +++ b/lib/mgmt.h @@ -586,15 +586,11 @@ struct mgmt_cp_set_phy_confguration { #define MGMT_OP_SET_BLOCKED_KEYS 0x0046 -#define MGMT_OP_READ_SECURITY_INFO 0x0048 -struct mgmt_rp_read_security_info { - uint16_t sec_len; - uint8_t sec[0]; -} __packed; +#define MGMT_OP_SET_WIDEBAND_SPEECH 0x0047 #define HCI_BLOCKED_KEY_TYPE_LINKKEY 0x00 -#define HCI_BLOCKED_KEY_TYPE_LTK 0x01 -#define HCI_BLOCKED_KEY_TYPE_IRK 0x02 +#define HCI_BLOCKED_KEY_TYPE_LTK 0x01 +#define HCI_BLOCKED_KEY_TYPE_IRK 0x02 struct mgmt_blocked_key_info { uint8_t type; @@ -606,7 +602,11 @@ struct mgmt_cp_set_blocked_keys { struct mgmt_blocked_key_info keys[0]; } __packed; -#define MGMT_OP_SET_WIDEBAND_SPEECH 0x0047 +#define MGMT_OP_READ_SECURITY_INFO 0x0048 +struct mgmt_rp_read_security_info { + uint16_t sec_len; + uint8_t sec[0]; +} __packed; #define MGMT_EV_CMD_COMPLETE 0x0001 struct mgmt_ev_cmd_complete { -- 2.26.2.526.g744177e7f7-goog