diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 05:30:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 05:30:00 +0000 |
| commit | ee355114ec6062d00c1376b184b886a39e74fd4e (patch) | |
| tree | da9330872894208b121ac18e2abbc801b67f1509 /net | |
| parent | d1003cbd87479d4962fe017c0f913dde9c4d026a (diff) | |
Merge with Linux 2.4.0-test6-pre9.
Diffstat (limited to 'net')
| -rw-r--r-- | net/packet/af_packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 862cc7027..bf557e253 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1568,7 +1568,7 @@ static void free_pg_vec(unsigned long *pg_vec, unsigned order, unsigned len) pend = virt_to_page(pg_vec[i] + (PAGE_SIZE << order) - 1); for (page = virt_to_page(pg_vec[i]); page <= pend; page++) - mem_map_unreserve(page); + clear_bit(PG_reserved, &page->flags); free_pages(pg_vec[i], order); } } @@ -1623,7 +1623,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing pend = virt_to_page(pg_vec[i] + (PAGE_SIZE << order) - 1); for (page = virt_to_page(pg_vec[i]); page <= pend; page++) - mem_map_reserve(page); + set_bit(PG_reserved, &page->flags); } /* Page vector is allocated */ |