Merge "UPSTREAM: net/packet: rx_owner_map depends on pg_vec"

net/packet/af_packet.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -4437,9 +4437,10 @@ static int packet_set_ring(struct sock sk, union tpacket_req_u req_u,
		}

		out_free_pg_vec:
		if (pg_vec) {
		bitmap_free(rx_owner_map);
		if (pg_vec)
		free_pg_vec(pg_vec, order, req->tp_block_nr);
		}
		out:
		return err;
		}