From 422499c2ae18cf4bbc4c71c6ec492ecc6dd34eab Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Wed, 20 Mar 2013 09:02:41 +0000 Subject: [PATCH] --- yaml --- r: 368342 b: refs/heads/master c: e76d120b68d2e0f159ba999b1210920a5a0ed53d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/chelsio/cxgb/sge.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 72b3abf1a4a3..affae6a46492 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6f68034de8a5784dfeabb337506254c80b4c8c6 +refs/heads/master: e76d120b68d2e0f159ba999b1210920a5a0ed53d diff --git a/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c b/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c index 89bef504d9dc..55fe8c9f0484 100644 --- a/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c +++ b/trunk/drivers/net/ethernet/chelsio/cxgb/sge.c @@ -1046,11 +1046,10 @@ static inline struct sk_buff *get_packet(struct pci_dev *pdev, const struct freelQ_ce *ce = &fl->centries[fl->cidx]; if (len < copybreak) { - skb = alloc_skb(len + 2, GFP_ATOMIC); + skb = netdev_alloc_skb_ip_align(NULL, len); if (!skb) goto use_orig_buf; - skb_reserve(skb, 2); /* align IP header */ skb_put(skb, len); pci_dma_sync_single_for_cpu(pdev, dma_unmap_addr(ce, dma_addr),