diff options
| -rw-r--r-- | drivers/net/ethernet/broadcom/b44.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c index ffeaf476a120..d86d6baf9681 100644 --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c | |||
| @@ -836,7 +836,7 @@ static int b44_rx(struct b44 *bp, int budget) | |||
| 836 | struct sk_buff *copy_skb; | 836 | struct sk_buff *copy_skb; |
| 837 | 837 | ||
| 838 | b44_recycle_rx(bp, cons, bp->rx_prod); | 838 | b44_recycle_rx(bp, cons, bp->rx_prod); |
| 839 | copy_skb = netdev_alloc_skb_ip_align(bp->dev, len); | 839 | copy_skb = napi_alloc_skb(&bp->napi, len); |
| 840 | if (copy_skb == NULL) | 840 | if (copy_skb == NULL) |
| 841 | goto drop_it_no_recycle; | 841 | goto drop_it_no_recycle; |
| 842 | 842 | ||
diff --git a/drivers/net/ethernet/broadcom/bcm63xx_enet.c b/drivers/net/ethernet/broadcom/bcm63xx_enet.c index 3e8d1a88ed3d..21206d33b638 100644 --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c | |||
| @@ -385,7 +385,7 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget) | |||
| 385 | if (len < copybreak) { | 385 | if (len < copybreak) { |
| 386 | struct sk_buff *nskb; | 386 | struct sk_buff *nskb; |
| 387 | 387 | ||
| 388 | nskb = netdev_alloc_skb_ip_align(dev, len); | 388 | nskb = napi_alloc_skb(&priv->napi, len); |
| 389 | if (!nskb) { | 389 | if (!nskb) { |
| 390 | /* forget packet, just rearm desc */ | 390 | /* forget packet, just rearm desc */ |
| 391 | dev->stats.rx_dropped++; | 391 | dev->stats.rx_dropped++; |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index b4d71fd909ee..1d1147c93d59 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | |||
| @@ -1015,7 +1015,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) | |||
| 1015 | */ | 1015 | */ |
| 1016 | if ((bp->dev->mtu > ETH_MAX_PACKET_SIZE) && | 1016 | if ((bp->dev->mtu > ETH_MAX_PACKET_SIZE) && |
| 1017 | (len <= RX_COPY_THRESH)) { | 1017 | (len <= RX_COPY_THRESH)) { |
| 1018 | skb = netdev_alloc_skb_ip_align(bp->dev, len); | 1018 | skb = napi_alloc_skb(&fp->napi, len); |
| 1019 | if (skb == NULL) { | 1019 | if (skb == NULL) { |
| 1020 | DP(NETIF_MSG_RX_ERR | NETIF_MSG_RX_STATUS, | 1020 | DP(NETIF_MSG_RX_ERR | NETIF_MSG_RX_STATUS, |
| 1021 | "ERROR packet dropped because of alloc failure\n"); | 1021 | "ERROR packet dropped because of alloc failure\n"); |
