aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrice Goglin <brice@myri.com>2007-03-21 19:46:57 +0100
committerJeff Garzik <jeff@garzik.org>2007-03-23 01:48:35 -0400
commitb52a8b7f0aeff5b91921cd53728ac781cdb4cccf (patch)
tree945fd52337179c176ea966044c617a54b356a3d1
parentf761fae1ae1e6e35ae15fce99d225d08d6cff1e7 (diff)
downloadlinux-2.6.34-ux500-b52a8b7f0aeff5b91921cd53728ac781cdb4cccf.tar.gz
myri10ge: fix management of >4kB allocated pages
Fix management of allocated physical pages when the architecture page size is not 4kB since the firmware cannot cross 4K boundary. Signed-off-by: Brice Goglin <brice@myri.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/myri10ge/myri10ge.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 2449b9fd736..c89ca3fec16 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -905,6 +905,14 @@ myri10ge_alloc_rx_pages(struct myri10ge_priv *mgp, struct myri10ge_rx_buf *rx,
(rx->page_offset + bytes <= MYRI10GE_ALLOC_SIZE)) {
/* we can use part of previous page */
get_page(rx->page);
+#if MYRI10GE_ALLOC_SIZE > 4096
+ /* Firmware cannot cross 4K boundary.. */
+ if ((rx->page_offset >> 12) !=
+ ((rx->page_offset + bytes - 1) >> 12)) {
+ rx->page_offset =
+ (rx->page_offset + bytes) & ~4095;
+ }
+#endif
} else {
/* we need a new page */
page =