From 368da84240ce0b44c885c9bc1df6a51c98bcb9e0 Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Wed, 5 Jan 2011 07:10:38 +0000 Subject: [PATCH] --- yaml --- r: 236677 b: refs/heads/master c: 05b9321405efcca9ab217fb65c91915244ebf526 h: refs/heads/master i: 236675: 7770f4ba96f225b3cc0a62565e837f88ed9ecfe1 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/ethtool.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 5d6130f46ae5..06f39a49fcc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90da06692532541a38f9857972e1fd6b1cdfb45a +refs/heads/master: 05b9321405efcca9ab217fb65c91915244ebf526 diff --git a/trunk/drivers/net/e1000e/ethtool.c b/trunk/drivers/net/e1000e/ethtool.c index 323fd12c306b..daa7fe4b9fdd 100644 --- a/trunk/drivers/net/e1000e/ethtool.c +++ b/trunk/drivers/net/e1000e/ethtool.c @@ -684,20 +684,13 @@ static int e1000_set_ringparam(struct net_device *netdev, rx_old = adapter->rx_ring; err = -ENOMEM; - tx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL); + tx_ring = kmemdup(tx_old, sizeof(struct e1000_ring), GFP_KERNEL); if (!tx_ring) goto err_alloc_tx; - /* - * use a memcpy to save any previously configured - * items like napi structs from having to be - * reinitialized - */ - memcpy(tx_ring, tx_old, sizeof(struct e1000_ring)); - rx_ring = kzalloc(sizeof(struct e1000_ring), GFP_KERNEL); + rx_ring = kmemdup(rx_old, sizeof(struct e1000_ring), GFP_KERNEL); if (!rx_ring) goto err_alloc_rx; - memcpy(rx_ring, rx_old, sizeof(struct e1000_ring)); adapter->tx_ring = tx_ring; adapter->rx_ring = rx_ring;