From a5b04528605a7cb28a2e6496f0dbd6171d63317f Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 4 Jun 2007 13:25:40 -0700 Subject: [PATCH] --- yaml --- r: 58367 b: refs/heads/master c: bf0dcbd929faf036f1a4f2918090344d0e249cf5 h: refs/heads/master i: 58365: 382e97857cbcd542f091abd3b3839e88b75dc102 58363: d1bb73079e471a4aededc2c431d620778e45ea43 58359: ab2f4b5b03317754c80ec1c36e606aeb774d333e 58351: 21c818f7b4ea36a9ad287727822ce15f0255ceee 58335: f5a0524658e9761d2119de07e91198af66b75ef1 58303: 5133c858f16f14c0d162a724e6b26a77bc33508f 58239: 4262ba0ae16539f576d80b5bfa053bae56e45131 58111: aeda7c67a2ba0d205f932c91182254f33bd06665 57855: 67805f9ec90563f68e9f09b1730acb228cb55abe 57343: f802f7a104b9d0892ea2759fee445440f015ed2e v: v3 --- [refs] | 2 +- trunk/drivers/net/b44.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5dce06b4fda5..4a09d6fa17d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72f4861ef9b1c1ca6e4abb49854698e80d3b684d +refs/heads/master: bf0dcbd929faf036f1a4f2918090344d0e249cf5 diff --git a/trunk/drivers/net/b44.c b/trunk/drivers/net/b44.c index 8fdcb698d611..96fb0ec905a7 100644 --- a/trunk/drivers/net/b44.c +++ b/trunk/drivers/net/b44.c @@ -653,7 +653,7 @@ static int b44_alloc_rx_skb(struct b44 *bp, int src_idx, u32 dest_idx_unmasked) src_map = &bp->rx_buffers[src_idx]; dest_idx = dest_idx_unmasked & (B44_RX_RING_SIZE - 1); map = &bp->rx_buffers[dest_idx]; - skb = dev_alloc_skb(RX_PKT_BUF_SZ); + skb = netdev_alloc_skb(bp->dev, RX_PKT_BUF_SZ); if (skb == NULL) return -ENOMEM; @@ -669,7 +669,7 @@ static int b44_alloc_rx_skb(struct b44 *bp, int src_idx, u32 dest_idx_unmasked) if (!dma_mapping_error(mapping)) pci_unmap_single(bp->pdev, mapping, RX_PKT_BUF_SZ,PCI_DMA_FROMDEVICE); dev_kfree_skb_any(skb); - skb = __dev_alloc_skb(RX_PKT_BUF_SZ,GFP_DMA); + skb = __netdev_alloc_skb(bp->dev, RX_PKT_BUF_SZ, GFP_ATOMIC|GFP_DMA); if (skb == NULL) return -ENOMEM; mapping = pci_map_single(bp->pdev, skb->data, @@ -684,7 +684,6 @@ static int b44_alloc_rx_skb(struct b44 *bp, int src_idx, u32 dest_idx_unmasked) } } - skb->dev = bp->dev; rh = (struct rx_header *) skb->data; skb_reserve(skb, RX_PKT_OFFSET);