Merge branch 'qrtr-Broadcasting-control-messages' (16fd5d53) · Commits · 戴 / test

Arun Kumar Neelakantam says: ==================== net: qrtr: Broadcasting control messages Allow messages only from control port to broadcast to avoid unnecessary messages and reset the node to local router NODE ID in control messages otherwise remote routers consider the packets as invalid and Drops it. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

net/qrtr/qrtr.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -191,8 +191,13 @@ static int qrtr_node_enqueue(struct qrtr_node node, struct sk_buff skb,
		hdr->type = cpu_to_le32(type);
		hdr->src_node_id = cpu_to_le32(from->sq_node);
		hdr->src_port_id = cpu_to_le32(from->sq_port);
		if (to->sq_port == QRTR_PORT_CTRL) {
		hdr->dst_node_id = cpu_to_le32(node->nid);
		hdr->dst_port_id = cpu_to_le32(QRTR_NODE_BCAST);
		} else {
		hdr->dst_node_id = cpu_to_le32(to->sq_node);
		hdr->dst_port_id = cpu_to_le32(to->sq_port);
		}

		hdr->size = cpu_to_le32(len);
		hdr->confirm_rx = 0;
		@@ -764,6 +769,10 @@ static int qrtr_sendmsg(struct socket sock, struct msghdr msg, size_t len)
		node = NULL;
		if (addr->sq_node == QRTR_NODE_BCAST) {
		enqueue_fn = qrtr_bcast_enqueue;
		if (addr->sq_port != QRTR_PORT_CTRL) {
		release_sock(sk);
		return -ENOTCONN;
		}
		} else if (addr->sq_node == ipc->us.sq_node) {
		enqueue_fn = qrtr_local_enqueue;
		} else {

Admin message