Commit 399e06a5 authored by Markus Elfring's avatar Markus Elfring Committed by David S. Miller
Browse files

ethernet: Delete unnecessary checks before the macro call “dev_kfree_skb” 



The dev_kfree_skb() function performs also input parameter validation.
Thus the test around the shown calls is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5477fccf

drivers/net/ethernet/amd/ni65.c

+2 −4
Original line number Diff line number Diff line
@@ -697,7 +697,6 @@ static void ni65_free_buffer(struct priv *p) 
	for(i=0;i<TMDNUM;i++) {

		kfree(p->tmdbounce[i]);

#ifdef XMT_VIA_SKB

		if(p->tmd_skb[i])

		dev_kfree_skb(p->tmd_skb[i]);

#endif

	}
@@ -705,7 +704,6 @@ static void ni65_free_buffer(struct priv *p) 
	for(i=0;i<RMDNUM;i++)

	{

#ifdef RCV_VIA_SKB

		if(p->recv_skb[i])

		dev_kfree_skb(p->recv_skb[i]);

#else

		kfree(p->recvbounce[i]);

drivers/net/ethernet/broadcom/bcmsysport.c

+1 −2
Original line number Diff line number Diff line
@@ -708,7 +708,6 @@ static int bcm_sysport_alloc_rx_bufs(struct bcm_sysport_priv *priv) 
	for (i = 0; i < priv->num_rx_bds; i++) {

		cb = &priv->rx_cbs[i];

		skb = bcm_sysport_rx_refill(priv, cb);

		if (skb)

		dev_kfree_skb(skb);

		if (!cb->skb)

			return -ENOMEM;

drivers/net/ethernet/broadcom/genet/bcmgenet.c

+3 −8
Original line number Diff line number Diff line
@@ -2515,19 +2515,14 @@ static int bcmgenet_dma_teardown(struct bcmgenet_priv *priv) 
static void bcmgenet_fini_dma(struct bcmgenet_priv *priv)

{

	struct netdev_queue *txq;

	struct sk_buff *skb;

	struct enet_cb *cb;

	int i;



	bcmgenet_fini_rx_napi(priv);

	bcmgenet_fini_tx_napi(priv);



	for (i = 0; i < priv->num_tx_bds; i++) {

		cb = priv->tx_cbs + i;

		skb = bcmgenet_free_tx_cb(&priv->pdev->dev, cb);

		if (skb)

			dev_kfree_skb(skb);

	}

	for (i = 0; i < priv->num_tx_bds; i++)

		dev_kfree_skb(bcmgenet_free_tx_cb(&priv->pdev->dev,

						  priv->tx_cbs + i));



	for (i = 0; i < priv->hw_params->tx_queues; i++) {

		txq = netdev_get_tx_queue(priv->dev, priv->tx_rings[i].queue);

drivers/net/ethernet/freescale/gianfar.c

+1 −2
Original line number Diff line number Diff line
@@ -2005,7 +2005,6 @@ static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue) 


	struct rxbd8 *rxbdp = rx_queue->rx_bd_base;



	if (rx_queue->skb)

	dev_kfree_skb(rx_queue->skb);



	for (i = 0; i < rx_queue->rx_ring_size; i++) {

drivers/net/ethernet/ibm/ehea/ehea_main.c

+4 −8
Original line number Diff line number Diff line
@@ -1577,19 +1577,15 @@ static int ehea_clean_portres(struct ehea_port *port, struct ehea_port_res *pr) 
		ehea_destroy_eq(pr->eq);



		for (i = 0; i < pr->rq1_skba.len; i++)

			if (pr->rq1_skba.arr[i])

			dev_kfree_skb(pr->rq1_skba.arr[i]);



		for (i = 0; i < pr->rq2_skba.len; i++)

			if (pr->rq2_skba.arr[i])

			dev_kfree_skb(pr->rq2_skba.arr[i]);



		for (i = 0; i < pr->rq3_skba.len; i++)

			if (pr->rq3_skba.arr[i])

			dev_kfree_skb(pr->rq3_skba.arr[i]);



		for (i = 0; i < pr->sq_skba.len; i++)

			if (pr->sq_skba.arr[i])

			dev_kfree_skb(pr->sq_skba.arr[i]);



		vfree(pr->rq1_skba.arr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE