From 4d098ea66ba69ad5b71253ac6bc51a7bd4c4ef6a Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Fri, 8 Jul 2011 05:29:30 +0000 Subject: [PATCH] --- yaml --- r: 256169 b: refs/heads/master c: 0a0e2344a62ce9e7fac6129d6292e59aecfceced h: refs/heads/master i: 256167: 7fded8dacd937058faeda86be14ae6145f2a94fb v: v3 --- [refs] | 2 +- trunk/drivers/net/bna/bnad.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 97ce7c05e964..5b01063659fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 135d23d66c53ade614c288d422f4c4b3205eb201 +refs/heads/master: 0a0e2344a62ce9e7fac6129d6292e59aecfceced diff --git a/trunk/drivers/net/bna/bnad.c b/trunk/drivers/net/bna/bnad.c index 44e219c910da..795b93b73b12 100644 --- a/trunk/drivers/net/bna/bnad.c +++ b/trunk/drivers/net/bna/bnad.c @@ -386,14 +386,12 @@ bnad_alloc_n_post_rxbufs(struct bnad *bnad, struct bna_rcb *rcb) BNA_RXQ_QPGE_PTR_GET(unmap_prod, rcb->sw_qpt, rxent, wi_range); } - skb = alloc_skb(rcb->rxq->buffer_size + NET_IP_ALIGN, - GFP_ATOMIC); + skb = netdev_alloc_skb_ip_align(bnad->netdev, + rcb->rxq->buffer_size); if (unlikely(!skb)) { BNAD_UPDATE_CTR(bnad, rxbuf_alloc_failed); goto finishing; } - skb->dev = bnad->netdev; - skb_reserve(skb, NET_IP_ALIGN); unmap_array[unmap_prod].skb = skb; dma_addr = dma_map_single(&bnad->pcidev->dev, skb->data, rcb->rxq->buffer_size,