Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f755b6b6 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: qrtr: Change port allocation to use cyclic idr"

parents 81b76819 06809f98

net/qrtr/qrtr.c

+4 −4
Original line number Diff line number Diff line
@@ -759,9 +759,8 @@ static int qrtr_port_assign(struct qrtr_sock *ipc, int *port) 


	mutex_lock(&qrtr_port_lock);

	if (!*port) {

		rc = idr_alloc(&qrtr_ports, ipc,

			       QRTR_MIN_EPH_SOCKET, QRTR_MAX_EPH_SOCKET + 1,

			       GFP_ATOMIC);

		rc = idr_alloc_cyclic(&qrtr_ports, ipc, QRTR_MIN_EPH_SOCKET,

				      QRTR_MAX_EPH_SOCKET + 1, GFP_ATOMIC);

		if (rc >= 0)

			*port = rc;

	} else if (*port < QRTR_MIN_EPH_SOCKET && !capable(CAP_NET_ADMIN)) {
@@ -769,7 +768,8 @@ static int qrtr_port_assign(struct qrtr_sock *ipc, int *port) 
	} else if (*port == QRTR_PORT_CTRL) {

		rc = idr_alloc(&qrtr_ports, ipc, 0, 1, GFP_ATOMIC);

	} else {

		rc = idr_alloc(&qrtr_ports, ipc, *port, *port + 1, GFP_ATOMIC);

		rc = idr_alloc_cyclic(&qrtr_ports, ipc, *port, *port + 1,

				      GFP_ATOMIC);

		if (rc >= 0)

			*port = rc;

	}