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

Commit 179d80af authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

sh_eth: remove checks around dev_kfree_skb() calls 



Since consume_skb() (and hence dev_kfree_skb() macro) checks the passed pointer
for NULL, there's no need to check for NULL before invoking dev_kfree_skb().

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23629477

drivers/net/ethernet/renesas/sh_eth.c

+6 −12
Original line number Diff line number Diff line
@@ -1094,21 +1094,17 @@ static void sh_eth_ring_free(struct net_device *ndev) 


	/* Free Rx skb ringbuffer */

	if (mdp->rx_skbuff) {

		for (i = 0; i < mdp->num_rx_ring; i++) {

			if (mdp->rx_skbuff[i])

		for (i = 0; i < mdp->num_rx_ring; i++)

			dev_kfree_skb(mdp->rx_skbuff[i]);

	}

	}

	kfree(mdp->rx_skbuff);

	mdp->rx_skbuff = NULL;



	/* Free Tx skb ringbuffer */

	if (mdp->tx_skbuff) {

		for (i = 0; i < mdp->num_tx_ring; i++) {

			if (mdp->tx_skbuff[i])

		for (i = 0; i < mdp->num_tx_ring; i++)

			dev_kfree_skb(mdp->tx_skbuff[i]);

	}

	}

	kfree(mdp->tx_skbuff);

	mdp->tx_skbuff = NULL;

}
@@ -2077,12 +2073,10 @@ static void sh_eth_tx_timeout(struct net_device *ndev) 
		rxdesc = &mdp->rx_ring[i];

		rxdesc->status = 0;

		rxdesc->addr = 0xBADF00D0;

		if (mdp->rx_skbuff[i])

		dev_kfree_skb(mdp->rx_skbuff[i]);

		mdp->rx_skbuff[i] = NULL;

	}

	for (i = 0; i < mdp->num_tx_ring; i++) {

		if (mdp->tx_skbuff[i])

		dev_kfree_skb(mdp->tx_skbuff[i]);

		mdp->tx_skbuff[i] = NULL;

	}