Merge "Fix assert when freeing L2CAP flow control credit packets" (1abb0870) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/l2cap/l2c_csm.cc

+0 −15

Original line number	Original line	Diff line number	Diff line
	@@ -279,11 +279,6 @@ static void l2c_csm_closed(tL2C_CCB* p_ccb, uint16_t event, void* p_data) {
	case L2CEVT_L2CA_DISCONNECT_REQ: /* Upper wants to disconnect */		case L2CEVT_L2CA_DISCONNECT_REQ: /* Upper wants to disconnect */
	l2cu_release_ccb(p_ccb);		l2cu_release_ccb(p_ccb);
	break;		break;

	case L2CEVT_L2CA_SEND_FLOW_CONTROL_CREDIT:
	case L2CEVT_L2CAP_RECV_FLOW_CONTROL_CREDIT:
	osi_free(p_data);
	break;
	}		}
	}		}

	@@ -604,11 +599,6 @@ static void l2c_csm_w4_l2cap_connect_rsp(tL2C_CCB* p_ccb, uint16_t event,
	l2cu_send_peer_connect_req(p_ccb); /* Start Connection */		l2cu_send_peer_connect_req(p_ccb); /* Start Connection */
	}		}
	break;		break;

	case L2CEVT_L2CA_SEND_FLOW_CONTROL_CREDIT:
	case L2CEVT_L2CAP_RECV_FLOW_CONTROL_CREDIT:
	osi_free(p_data);
	break;
	}		}
	}		}

	@@ -1182,11 +1172,6 @@ static void l2c_csm_w4_l2cap_disconnect_rsp(tL2C_CCB* p_ccb, uint16_t event,
	case L2CEVT_L2CA_DATA_WRITE: /* Upper layer data to send */		case L2CEVT_L2CA_DATA_WRITE: /* Upper layer data to send */
	osi_free(p_data);		osi_free(p_data);
	break;		break;

	case L2CEVT_L2CA_SEND_FLOW_CONTROL_CREDIT:
	case L2CEVT_L2CAP_RECV_FLOW_CONTROL_CREDIT:
	osi_free(p_data);
	break;
	}		}
	}		}