am 5d082f18: Merge "Fix PAN control callback definition to match what bluedroid is doing."

* commit '5d082f1826cd5b72cd2a0eb0116c8a613d7555dd':
  Fix PAN control callback definition to match what bluedroid is doing.

1 files changed, 2 insertions, 2 deletions

diff --git a/include/hardware/bt_pan.h b/include/hardware/bt_pan.h
index c8b36b40..83e7949b 100644
--- a/include/hardware/bt_pan.h
+++ b/include/hardware/bt_pan.h
@@ -40,8 +40,8 @@ typedef enum {
 */
 typedef void (*btpan_connection_state_callback)(btpan_connection_state_t state, bt_status_t error,
                                                 const bt_bdaddr_t *bd_addr, int local_role, int remote_role);
-typedef void (*btpan_control_state_callback)(btpan_control_state_t state, bt_status_t error,
-                                            int local_role, const char* ifname);
+typedef void (*btpan_control_state_callback)(btpan_control_state_t state, int local_role,
+                                            bt_status_t error, const char* ifname);
 
 typedef struct {
     size_t size;