Received-SPF: softfail (google.com: domain of transitioning linux-bluetooth-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   Brian Gix <brian.gix@intel.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     brian.gix@intel.com, inga.stotland@intel.com
Subject: [PATCH 6/7] mesh: Add new MGMT based IO transport
Date:   Wed, 23 Feb 2022 18:06:23 -0800
Message-Id: <20220224020624.159247-7-brian.gix@intel.com>
In-Reply-To: <20220224020624.159247-1-brian.gix@intel.com>
References: <20220224020624.159247-1-brian.gix@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Adds required new modules to support kernel based MGMT tx/rx
---
 Makefile.mesh          |  9 ++++-----
 mesh/mesh-io-generic.h |  1 -
 mesh/mesh-io-mgmt.c    |  2 +-
 mesh/mesh-io-mgmt.h    | 11 +++++++++++
 mesh/mesh-io-unit.c    |  2 +-
 mesh/mesh-io.c         |  1 +
 6 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 mesh/mesh-io-mgmt.h

diff --git a/Makefile.mesh b/Makefile.mesh
index fc28b0557..3047f362b 100644
--- a/Makefile.mesh
+++ b/Makefile.mesh
@@ -13,12 +13,11 @@ endif
 mesh_sources = mesh/mesh.h mesh/mesh.c \
 				mesh/net-keys.h mesh/net-keys.c \
 				mesh/mesh-io.h mesh/mesh-io.c \
-				mesh/mesh-mgmt.c mesh/mesh-mgmt.h \
+				mesh/mesh-mgmt.h  mesh/mesh-mgmt.c \
 				mesh/error.h mesh/mesh-io-api.h \
-				mesh/mesh-io-generic.h \
-				mesh/mesh-io-generic.c \
-				mesh/mesh-io-unit.h \
-				mesh/mesh-io-unit.c \
+				mesh/mesh-io-unit.h mesh/mesh-io-unit.c \
+				mesh/mesh-io-mgmt.h mesh/mesh-io-mgmt.c \
+				mesh/mesh-io-generic.h mesh/mesh-io-generic.c \
 				mesh/net.h mesh/net.c \
 				mesh/crypto.h mesh/crypto.c \
 				mesh/friend.h mesh/friend.c \
diff --git a/mesh/mesh-io-generic.h b/mesh/mesh-io-generic.h
index 546e15d62..915e376bf 100644
--- a/mesh/mesh-io-generic.h
+++ b/mesh/mesh-io-generic.h
@@ -9,4 +9,3 @@
  */
 
 extern const struct mesh_io_api mesh_io_generic;
-extern const struct mesh_io_api mesh_io_mgmt;
diff --git a/mesh/mesh-io-mgmt.c b/mesh/mesh-io-mgmt.c
index 092e81e79..cf18966fb 100644
--- a/mesh/mesh-io-mgmt.c
+++ b/mesh/mesh-io-mgmt.c
@@ -29,7 +29,7 @@
 #include "mesh/mesh-mgmt.h"
 #include "mesh/mesh-io.h"
 #include "mesh/mesh-io-api.h"
-#include "mesh/mesh-io-generic.h"
+#include "mesh/mesh-io-mgmt.h"
 
 struct mesh_io_private {
 	struct mesh_io *io;
diff --git a/mesh/mesh-io-mgmt.h b/mesh/mesh-io-mgmt.h
new file mode 100644
index 000000000..455691c8f
--- /dev/null
+++ b/mesh/mesh-io-mgmt.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2018  Intel Corporation. All rights reserved.
+ *
+ *
+ */
+
+extern const struct mesh_io_api mesh_io_mgmt;
diff --git a/mesh/mesh-io-unit.c b/mesh/mesh-io-unit.c
index 81d9de837..f818140b4 100644
--- a/mesh/mesh-io-unit.c
+++ b/mesh/mesh-io-unit.c
@@ -25,7 +25,7 @@
 #include "mesh/dbus.h"
 #include "mesh/mesh-io.h"
 #include "mesh/mesh-io-api.h"
-#include "mesh/mesh-io-generic.h"
+#include "mesh/mesh-io-unit.h"
 
 struct mesh_io_private {
 	struct mesh_io *io;
diff --git a/mesh/mesh-io.c b/mesh/mesh-io.c
index 95ee9a7f2..8bae7ff7f 100644
--- a/mesh/mesh-io.c
+++ b/mesh/mesh-io.c
@@ -24,6 +24,7 @@
 #include "mesh/mesh-io-api.h"
 
 /* List of Mesh-IO Type headers */
+#include "mesh/mesh-io-mgmt.h"
 #include "mesh/mesh-io-generic.h"
 #include "mesh/mesh-io-unit.h"
 
-- 
2.35.1