Commit 45abfb10 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller

ethernet/broadcom: Use napi_alloc_skb instead of netdev_alloc_skb_ip_align

This patch replaces the calls to netdev_alloc_skb_ip_align in the
copybreak paths.

Cc: Gary Zambrano <zambrano@broadcom.com>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Ariel Elior <ariel.elior@qlogic.com>
Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e2338f86
...@@ -836,7 +836,7 @@ static int b44_rx(struct b44 *bp, int budget) ...@@ -836,7 +836,7 @@ static int b44_rx(struct b44 *bp, int budget)
struct sk_buff *copy_skb; struct sk_buff *copy_skb;
b44_recycle_rx(bp, cons, bp->rx_prod); b44_recycle_rx(bp, cons, bp->rx_prod);
copy_skb = netdev_alloc_skb_ip_align(bp->dev, len); copy_skb = napi_alloc_skb(&bp->napi, len);
if (copy_skb == NULL) if (copy_skb == NULL)
goto drop_it_no_recycle; goto drop_it_no_recycle;
......
...@@ -385,7 +385,7 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget) ...@@ -385,7 +385,7 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)
if (len < copybreak) { if (len < copybreak) {
struct sk_buff *nskb; struct sk_buff *nskb;
nskb = netdev_alloc_skb_ip_align(dev, len); nskb = napi_alloc_skb(&priv->napi, len);
if (!nskb) { if (!nskb) {
/* forget packet, just rearm desc */ /* forget packet, just rearm desc */
dev->stats.rx_dropped++; dev->stats.rx_dropped++;
......
...@@ -1015,7 +1015,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget) ...@@ -1015,7 +1015,7 @@ static int bnx2x_rx_int(struct bnx2x_fastpath *fp, int budget)
*/ */
if ((bp->dev->mtu > ETH_MAX_PACKET_SIZE) && if ((bp->dev->mtu > ETH_MAX_PACKET_SIZE) &&
(len <= RX_COPY_THRESH)) { (len <= RX_COPY_THRESH)) {
skb = netdev_alloc_skb_ip_align(bp->dev, len); skb = napi_alloc_skb(&fp->napi, len);
if (skb == NULL) { if (skb == NULL) {
DP(NETIF_MSG_RX_ERR | NETIF_MSG_RX_STATUS, DP(NETIF_MSG_RX_ERR | NETIF_MSG_RX_STATUS,
"ERROR packet dropped because of alloc failure\n"); "ERROR packet dropped because of alloc failure\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment