Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 352517
b: refs/heads/master
c: 885d299
h: refs/heads/master
i:
  352515: e6bb653
v: v3
  • Loading branch information
Hauke Mehrtens authored and David S. Miller committed Feb 18, 2013
1 parent 53bbaae commit bb1eb1f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9aac22deb11a3da4df5b868fc3d30b07185b0d71
refs/heads/master: 885d29941435e16dea6a52e42bbb3c8b87676bd8
2 changes: 1 addition & 1 deletion trunk/drivers/net/ethernet/broadcom/bgmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ static int bgmac_dma_rx_read(struct bgmac *bgmac, struct bgmac_dma_ring *ring,
bgmac_err(bgmac, "Found poisoned packet at slot %d, DMA issue!\n",
ring->start);
} else {
new_skb = netdev_alloc_skb(bgmac->net_dev, len);
new_skb = netdev_alloc_skb_ip_align(bgmac->net_dev, len);
if (new_skb) {
skb_put(new_skb, len);
skb_copy_from_linear_data_offset(skb, BGMAC_RX_FRAME_OFFSET,
Expand Down

0 comments on commit bb1eb1f

Please sign in to comment.