Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05b93214 authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: Use kmemdup rather than duplicating its implementation 

The semantic patch that makes this output is available
in scripts/coccinelle/api/memdup.cocci.

More information about semantic patching is available at
http://coccinelle.lip6.fr/



Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Tested-by: default avatar <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 90da0669

drivers/net/e1000e/ethtool.c

+2 −9
Original line number Original line Diff line number Diff line
@@ -684,20 +684,13 @@ static int e1000_set_ringparam(struct net_device *netdev, 
	rx_old = adapter->rx_ring;

	rx_old = adapter->rx_ring;





	err = -ENOMEM;

	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)

	if (!tx_ring)

		goto err_alloc_tx;

		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)

	if (!rx_ring)

		goto err_alloc_rx;

		goto err_alloc_rx;

	memcpy(rx_ring, rx_old, sizeof(struct e1000_ring));





	adapter->tx_ring = tx_ring;

	adapter->tx_ring = tx_ring;

	adapter->rx_ring = rx_ring;

	adapter->rx_ring = rx_ring;