i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When getting the memory map, ask only for 2046 bytes instead of

Browse Source 
2048 bytes. This should fix bugs #993 and #997.
On BeOS R5 asking for 2 bytes too much wasn't a problem, as we 
only need the first page_entry, and it didn't return any Error.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19992 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2007-01-28 12:59:45 +00:00
parent 35f71eb445
commit cc30d340c3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/network/ipro1000/if_em_osdep.h
+5 -1
View File
@@ -127,7 +127,11 @@ static inline unsigned long vtophys(unsigned long virtual_addr)
{
physical_entry pe;
status_t err;
err = get_memory_map((void *)virtual_addr, 2048, &pe, 1);
// vtophys is called for the start of any page aligned contiguous large buffer,
// and also with offset 2 into 2048 byte aligned (non-contiguous) rx/tx buffer.
// Thus we only ask for 2046 bytes to get exactly one physical_entry. If the
// next physical page is non-contiguous, using 2048 may return B_BUFFER_OVERFLOW.
err = get_memory_map((void *)virtual_addr, 2046, &pe, 1);
if (err < 0)
panic("ipro1000: get_memory_map failed for %p, error %08lx\n", (void *)virtual_addr, err);
return (unsigned long) pe.address;