From bb1eb1f6eee0d72174a909f48e235ddf3ba50aaf Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 16 Feb 2013 11:10:38 +0000 Subject: [PATCH] --- yaml --- r: 352517 b: refs/heads/master c: 885d29941435e16dea6a52e42bbb3c8b87676bd8 h: refs/heads/master i: 352515: e6bb653852fd863d686a9f8c70553cff2345fcd9 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/bgmac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0263d6015e84..935ae43e2ea9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9aac22deb11a3da4df5b868fc3d30b07185b0d71 +refs/heads/master: 885d29941435e16dea6a52e42bbb3c8b87676bd8 diff --git a/trunk/drivers/net/ethernet/broadcom/bgmac.c b/trunk/drivers/net/ethernet/broadcom/bgmac.c index d34109004ee6..3fd32880e526 100644 --- a/trunk/drivers/net/ethernet/broadcom/bgmac.c +++ b/trunk/drivers/net/ethernet/broadcom/bgmac.c @@ -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,