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

Commit d3e8b858 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sh_eth-fixes' 



Sergei Shtylyov says:

====================
sh_eth: fix bugs in sh_eth_ring_init()

   Here's a set of 2 patches against DaveM's 'net.git' repo which fix couple of
bugs in the sh_eth_ring_init() function.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 615a1003 b61ed8fd

drivers/net/ethernet/renesas/sh_eth.c

+5 −5
Original line number Diff line number Diff line
@@ -1212,15 +1212,15 @@ static int sh_eth_ring_init(struct net_device *ndev) 
		mdp->rx_buf_sz += NET_IP_ALIGN;



	/* Allocate RX and TX skb rings */

	mdp->rx_skbuff = kmalloc_array(mdp->num_rx_ring,

				       sizeof(*mdp->rx_skbuff), GFP_KERNEL);

	mdp->rx_skbuff = kcalloc(mdp->num_rx_ring, sizeof(*mdp->rx_skbuff),

				 GFP_KERNEL);

	if (!mdp->rx_skbuff) {

		ret = -ENOMEM;

		return ret;

	}



	mdp->tx_skbuff = kmalloc_array(mdp->num_tx_ring,

				       sizeof(*mdp->tx_skbuff), GFP_KERNEL);

	mdp->tx_skbuff = kcalloc(mdp->num_tx_ring, sizeof(*mdp->tx_skbuff),

				 GFP_KERNEL);

	if (!mdp->tx_skbuff) {

		ret = -ENOMEM;

		goto skb_ring_free;
@@ -1232,7 +1232,7 @@ static int sh_eth_ring_init(struct net_device *ndev) 
					  GFP_KERNEL);

	if (!mdp->rx_ring) {

		ret = -ENOMEM;

		goto desc_ring_free;

		goto skb_ring_free;

	}



	mdp->dirty_rx = 0;