From b3de05df926df9ac4b1d45609bfd4506f1bcd743 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 9 Jul 2012 14:09:29 +0000 Subject: [PATCH] --- yaml --- r: 315093 b: refs/heads/master c: b06b66c05babe3483a585508655c1edb9e07f8dc h: refs/heads/master i: 315091: d688a5d423e9ebd0f11564306ae21dc01b10c032 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/micrel/ksz884x.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 177847c3639a..8f1cdfdfcfe3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a4511a0199a2653c88f4475e4bae77a7cc016e0 +refs/heads/master: b06b66c05babe3483a585508655c1edb9e07f8dc diff --git a/trunk/drivers/net/ethernet/micrel/ksz884x.c b/trunk/drivers/net/ethernet/micrel/ksz884x.c index 24a4c5716cf5..37b44b91950b 100644 --- a/trunk/drivers/net/ethernet/micrel/ksz884x.c +++ b/trunk/drivers/net/ethernet/micrel/ksz884x.c @@ -4480,14 +4480,12 @@ static void ksz_init_rx_buffers(struct dev_info *adapter) dma_buf->len = adapter->mtu; if (!dma_buf->skb) dma_buf->skb = alloc_skb(dma_buf->len, GFP_ATOMIC); - if (dma_buf->skb && !dma_buf->dma) { - dma_buf->skb->dev = adapter->dev; + if (dma_buf->skb && !dma_buf->dma) dma_buf->dma = pci_map_single( adapter->pdev, skb_tail_pointer(dma_buf->skb), dma_buf->len, PCI_DMA_FROMDEVICE); - } /* Set descriptor. */ set_rx_buf(desc, dma_buf->dma);