Bluetooth: L2CAP: Remove bogus NULL checks (525889c6) · Commits · Wenxi XU / zephyr

The ch pointer is the result of a CONTAINER_OF() operation, so checking it for NULL is pointless. Additionally, there's no place that calls this function with chan set to NULL. Signed-off-by:

Johan Hedberg <johan.hedberg@intel.com>

subsys/bluetooth/host/l2cap.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -110,12 +110,12 @@ static struct bt_l2cap_le_chan l2cap_chan_alloc_cid(struct bt_conn conn,
		* No action needed if there's already a CID allocated, e.g. in
		* the case of a fixed channel.
		*/
		if (ch && ch->rx.cid > 0) {
		if (ch->rx.cid > 0) {
		return ch;
		}

		for (cid = L2CAP_LE_CID_DYN_START; cid <= L2CAP_LE_CID_DYN_END; cid++) {
		if (ch && !bt_l2cap_le_lookup_rx_cid(conn, cid)) {
		if (!bt_l2cap_le_lookup_rx_cid(conn, cid)) {
		ch->rx.cid = cid;
		return ch;
		}

Admin message