aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/micrel
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2012-07-09 10:09:29 -0400
committerDavid S. Miller <davem@davemloft.net>2012-07-11 02:24:57 -0400
commitb06b66c05babe3483a585508655c1edb9e07f8dc (patch)
treeeda8796b5832568c92d3b77abf74aa1a2938c495 /drivers/net/ethernet/micrel
parent4a4511a0199a2653c88f4475e4bae77a7cc016e0 (diff)
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 <jdmason@kudzu.us> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/micrel')
-rw-r--r--drivers/net/ethernet/micrel/ksz884x.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c
index 24a4c5716cf5..37b44b91950b 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)
4480 dma_buf->len = adapter->mtu; 4480 dma_buf->len = adapter->mtu;
4481 if (!dma_buf->skb) 4481 if (!dma_buf->skb)
4482 dma_buf->skb = alloc_skb(dma_buf->len, GFP_ATOMIC); 4482 dma_buf->skb = alloc_skb(dma_buf->len, GFP_ATOMIC);
4483 if (dma_buf->skb && !dma_buf->dma) { 4483 if (dma_buf->skb && !dma_buf->dma)
4484 dma_buf->skb->dev = adapter->dev;
4485 dma_buf->dma = pci_map_single( 4484 dma_buf->dma = pci_map_single(
4486 adapter->pdev, 4485 adapter->pdev,
4487 skb_tail_pointer(dma_buf->skb), 4486 skb_tail_pointer(dma_buf->skb),
4488 dma_buf->len, 4487 dma_buf->len,
4489 PCI_DMA_FROMDEVICE); 4488 PCI_DMA_FROMDEVICE);
4490 }
4491 4489
4492 /* Set descriptor. */ 4490 /* Set descriptor. */
4493 set_rx_buf(desc, dma_buf->dma); 4491 set_rx_buf(desc, dma_buf->dma);