From: Jon Mason Date: Mon, 9 Jul 2012 14:09:29 +0000 (+0000) Subject: ksz884x: remove unnecessary setting of skb->dev X-Git-Tag: v3.6-rc1~125^2~239 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b06b66c05babe3483a585508655c1edb9e07f8dc;p=~emulex%2Finfiniband.git ksz884x: remove unnecessary setting of skb->dev skb->dev is being unnecessarily set during ring init. It is already being set to the proper value when eth_type_trans is called on packet receive, and the skb->dev is not referenced anywhere else in the code. Signed-off-by: Jon Mason Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index 24a4c5716cf..37b44b91950 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/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);