Merge "Revert "packet: fix race condition in packet_set_ring"" (38a0bcca) · Commits · e / devices / android_kernel_sony_msm8998

net/packet/af_packet.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -4156,7 +4156,6 @@ static int packet_set_ring(struct sock sk, union tpacket_req_u req_u,
		/* Added to avoid minimal code churn */
		struct tpacket_req *req = &req_u->req;

		lock_sock(sk);
		/* Opening a Tx-ring is NOT supported in TPACKET_V3 */
		if (!closing && tx_ring && (po->tp_version > TPACKET_V2)) {
		WARN(1, "Tx-ring is not supported.\n");
		@@ -4292,7 +4291,6 @@ static int packet_set_ring(struct sock sk, union tpacket_req_u req_u,
		if (pg_vec)
		free_pg_vec(pg_vec, order, req->tp_block_nr);
		out:
		release_sock(sk);
		return err;
		}