am 81173491: Merge "Bluetooth: Cleaning up pan_conn DB, if connection is not successf...

* commit '81173491454e47a0a24ab30fae0b59248516e844':
  Bluetooth: Cleaning up pan_conn DB, if connection is not successful.

diff --combined bta/pan/bta_pan_act.c
index 6e2d620,51dab86..ca3567c
--- 1/bta/pan/bta_pan_act.c
--- 2/bta/pan/bta_pan_act.c
+++ b/bta/pan/bta_pan_act.c
@@@ -43,40 -43,6 +43,40 @@@
  #define BTA_PAN_TX_MASK              0xF0
  
  /*******************************************************************************
 + **
 + ** Function    bta_pan_pm_conn_busy
 + **
 + ** Description set pan pm connection busy state
 + **
 + ** Params      p_scb: state machine control block of pan connection
 + **
 + ** Returns     void
 + **
 + *******************************************************************************/
 +static void bta_pan_pm_conn_busy(tBTA_PAN_SCB *p_scb)
 +{
 +    if ((p_scb != NULL) && (p_scb->state != BTA_PAN_IDLE_ST))
 +        bta_sys_busy(BTA_ID_PAN, p_scb->app_id, p_scb->bd_addr);
 +}
 +
 +/*******************************************************************************
 + **
 + ** Function    bta_pan_pm_conn_idle
 + **
 + ** Description set pan pm connection idle state
 + **
 + ** Params      p_scb: state machine control block of pan connection
 + **
 + ** Returns     void
 + **
 + *******************************************************************************/
 +static void bta_pan_pm_conn_idle(tBTA_PAN_SCB *p_scb)
 +{
 +    if ((p_scb != NULL) && (p_scb->state != BTA_PAN_IDLE_ST))
 +        bta_sys_idle(BTA_ID_PAN, p_scb->app_id, p_scb->bd_addr);
 +}
 +
 +/*******************************************************************************
  **
  ** Function         bta_pan_conn_state_cback
  **
@@@ -472,7 -438,7 +472,7 @@@ void bta_pan_open(tBTA_PAN_SCB *p_scb, 
  
      status = PAN_Connect (p_data->api_open.bd_addr, p_data->api_open.local_role, p_data->api_open.peer_role,
                          &p_scb->handle);
- 
+     APPL_TRACE_DEBUG("%s pan connect status: %d", __func__, status);
  
      if(status == PAN_SUCCESS)
      {
@@@ -491,8 -457,6 +491,8 @@@
          bta_pan_scb_dealloc(p_scb);
          bdcpy(data.bd_addr, p_data->api_open.bd_addr);
          data.status = BTA_PAN_FAIL;
 +        data.local_role = p_data->api_open.local_role;
 +        data.peer_role = p_data->api_open.peer_role;
          bta_pan_cb.p_cback(BTA_PAN_OPEN_EVT, (tBTA_PAN *)&data);
      }
  
@@@ -545,6 -509,8 +545,8 @@@ void bta_pan_conn_open(tBTA_PAN_SCB *p_
  
      tBTA_PAN_OPEN data;
  
+     APPL_TRACE_DEBUG("%s pan connection result: %d", __func__, p_data->conn.result);
+ 
      bdcpy(data.bd_addr, p_scb->bd_addr);
      data.handle = p_scb->handle;
      data.local_role = p_scb->local_role;
@@@ -554,7 -520,9 +556,9 @@@
      {
          data.status = BTA_PAN_SUCCESS;
          bta_pan_co_open(p_scb->handle, p_scb->app_id, p_scb->local_role, p_scb->peer_role, p_scb->bd_addr);
- 
+         p_scb->pan_flow_enable = TRUE;
+         p_scb->app_flow_enable = TRUE;
+         bta_sys_conn_open(BTA_ID_PAN ,p_scb->app_id, p_scb->bd_addr);
      }
      else
      {
@@@ -562,11 -530,6 +566,6 @@@
          data.status = BTA_PAN_FAIL;
      }
  
-     p_scb->pan_flow_enable = TRUE;
-     p_scb->app_flow_enable = TRUE;
- 
-     bta_sys_conn_open( BTA_ID_PAN ,p_scb->app_id, p_scb->bd_addr);
- 
      bta_pan_cb.p_cback(BTA_PAN_OPEN_EVT, (tBTA_PAN *)&data);
  
  
@@@ -661,14 -624,12 +660,14 @@@ void bta_pan_tx_path(tBTA_PAN_SCB *p_sc
      /* if data path configured for tx pull */
      if ((bta_pan_cb.flow_mask & BTA_PAN_TX_MASK) == BTA_PAN_TX_PULL)
      {
 +        bta_pan_pm_conn_busy(p_scb);
          /* call application callout function for tx path */
          bta_pan_co_tx_path(p_scb->handle, p_scb->app_id);
  
          /* free data that exceeds queue level */
          while(p_scb->data_queue.count > bta_pan_cb.q_level)
              GKI_freebuf(GKI_dequeue(&p_scb->data_queue));
 +        bta_pan_pm_conn_idle(p_scb);
      }
      /* if configured for zero copy push */
      else if ((bta_pan_cb.flow_mask & BTA_PAN_TX_MASK) == BTA_PAN_TX_PUSH_BUF)
@@@ -740,7 -701,6 +739,7 @@@ void bta_pan_write_buf(tBTA_PAN_SCB *p_
  {
      if ((bta_pan_cb.flow_mask & BTA_PAN_RX_MASK) == BTA_PAN_RX_PUSH_BUF)
      {
 +        bta_pan_pm_conn_busy(p_scb);
  
          PAN_WriteBuf (p_scb->handle,
                        ((tBTA_PAN_DATA_PARAMS *)p_data)->dst,
@@@ -748,7 -708,6 +747,7 @@@
                        ((tBTA_PAN_DATA_PARAMS *)p_data)->protocol,
                        (BT_HDR *)p_data,
                        ((tBTA_PAN_DATA_PARAMS *)p_data)->ext);
 +        bta_pan_pm_conn_idle(p_scb);
  
      }
  }

diff --combined btif/src/btif_pan.c
index 088c609,74a08d1..ae395ba
--- 1/btif/src/btif_pan.c
--- 2/btif/src/btif_pan.c
+++ b/btif/src/btif_pan.c
@@@ -214,20 -214,16 +214,20 @@@ static inline int btpan_role_to_bta(in
  
  static volatile int btpan_dev_local_role;
  static tBTA_PAN_ROLE_INFO bta_panu_info = {PANU_SERVICE_NAME, 0, PAN_SECURITY};
 -static tBTA_PAN_ROLE_INFO bta_pan_nap_info = {PAN_NAP_SERVICE_NAME, 0, PAN_SECURITY};
 +static tBTA_PAN_ROLE_INFO bta_pan_nap_info = {PAN_NAP_SERVICE_NAME, 1, PAN_SECURITY};
  
  static bt_status_t btpan_enable(int local_role)
  {
      int bta_pan_role;
      BTIF_TRACE_DEBUG("local_role:%d", local_role);
      bta_pan_role = btpan_role_to_bta(local_role);
 +#if BTA_PAN_INCLUDED == TRUE
      BTA_PanSetRole(bta_pan_role, &bta_panu_info, NULL, &bta_pan_nap_info);
      btpan_dev_local_role = local_role;
      return BT_STATUS_SUCCESS;
 +#else
 +    return BT_STATUS_FAIL;
 +#endif
  }
  
  static int btpan_get_local_role()
@@@ -330,16 -326,6 +330,16 @@@ static int tap_if_up(const char *devnam
      /*         ifr.ifr_hwaddr.sa_data[0], ifr.ifr_hwaddr.sa_data[1], ifr.ifr_hwaddr.sa_data[2], */
      /*         ifr.ifr_hwaddr.sa_data[3], ifr.ifr_hwaddr.sa_data[4], ifr.ifr_hwaddr.sa_data[5]); */
  
 +    /* The IEEE has specified that the most significant bit of the most significant byte is used to
 +     * determine a multicast address. If its a 1, that means multicast, 0 means unicast.
 +     * Kernel returns an error if we try to set a multicast address for the tun-tap ethernet interface.
 +     * Mask this bit to avoid any issue with auto generated address.
 +     */
 +    if (ifr.ifr_hwaddr.sa_data[0] & 0x01) {
 +        BTIF_TRACE_WARNING("Not a unicast MAC address, force multicast bit flipping");
 +        ifr.ifr_hwaddr.sa_data[0] &= ~0x01;
 +    }
 +
      err = ioctl(sk, SIOCSIFHWADDR, (caddr_t)&ifr);
  
      if (err < 0) {
@@@ -617,6 -603,9 +617,9 @@@ static void bta_pan_callback_transfer(U
                  /*         p_data->open.bd_addr[3], p_data->open.bd_addr[4], p_data->open.bd_addr[5]); */
                  btpan_connection_state_t state;
                  bt_status_t status;
+                 btpan_conn_t *conn = btpan_find_conn_handle(p_data->open.handle);
+ 
+                 ALOGV("%s pan connection open status: %d", __func__, p_data->open.status);
                  if(p_data->open.status == BTA_PAN_SUCCESS)
                  {
                      state = BTPAN_STATE_CONNECTED;
@@@ -626,8 -615,8 +629,8 @@@
                  {
                      state = BTPAN_STATE_DISCONNECTED;
                      status = BT_STATUS_FAIL;
+                     btpan_cleanup_conn(conn);
                  }
-                 btpan_conn_t* conn = btpan_find_conn_handle(p_data->open.handle);
                  /* debug("BTA_PAN_OPEN_EVT handle:%d, conn:%p",  p_data->open.handle, conn); */
                  /* debug("conn bta local_role:%d, bta remote role:%d", conn->local_role, conn->remote_role); */
                  int btpan_conn_local_role = bta_role_to_btpan(p_data->open.local_role);