git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
[pandora-kernel.git]
/
drivers
/
net
/
ethernet
/
intel
/
ixgb
/
ixgb_main.c
diff --git
a/drivers/net/ethernet/intel/ixgb/ixgb_main.c
b/drivers/net/ethernet/intel/ixgb/ixgb_main.c
index
ea48083
..
b5f94ab
100644
(file)
--- a/
drivers/net/ethernet/intel/ixgb/ixgb_main.c
+++ b/
drivers/net/ethernet/intel/ixgb/ixgb_main.c
@@
-2159,6
+2159,10
@@
map_skb:
skb->data,
adapter->rx_buffer_len,
DMA_FROM_DEVICE);
skb->data,
adapter->rx_buffer_len,
DMA_FROM_DEVICE);
+ if (dma_mapping_error(&pdev->dev, buffer_info->dma)) {
+ adapter->alloc_rx_buff_failed++;
+ break;
+ }
rx_desc = IXGB_RX_DESC(*rx_ring, i);
rx_desc->buff_addr = cpu_to_le64(buffer_info->dma);
rx_desc = IXGB_RX_DESC(*rx_ring, i);
rx_desc->buff_addr = cpu_to_le64(buffer_info->dma);
@@
-2168,7
+2172,8
@@
map_skb:
rx_desc->status = 0;
rx_desc->status = 0;
- if (++i == rx_ring->count) i = 0;
+ if (++i == rx_ring->count)
+ i = 0;
buffer_info = &rx_ring->buffer_info[i];
}
buffer_info = &rx_ring->buffer_info[i];
}