projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
intel
/
ixgbe
/
ixgbe_main.c
diff --git
a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 4d6223da4a19b7ad337714760552bf226b00f23f..569cb0757c93b02f35f5da97f0781cd0fa40953c 100644
(file)
--- a/
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@
-1945,7
+1945,7
@@
static bool ixgbe_add_rx_frag(struct ixgbe_ring *rx_ring,
/* Even if we own the page, we are not allowed to use atomic_set()
* This would break get_page_unless_zero() users.
*/
-
atomic_inc(&page->_count
);
+
page_ref_inc(page
);
return true;
}