Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Sergei Shtylyov and committed by
David S. Miller
179d80af 23629477

+6 -12
+6 -12
drivers/net/ethernet/renesas/sh_eth.c
··· 1094 1094 1095 1095 /* Free Rx skb ringbuffer */ 1096 1096 if (mdp->rx_skbuff) { 1097 - for (i = 0; i < mdp->num_rx_ring; i++) { 1098 - if (mdp->rx_skbuff[i]) 1099 - dev_kfree_skb(mdp->rx_skbuff[i]); 1100 - } 1097 + for (i = 0; i < mdp->num_rx_ring; i++) 1098 + dev_kfree_skb(mdp->rx_skbuff[i]); 1101 1099 } 1102 1100 kfree(mdp->rx_skbuff); 1103 1101 mdp->rx_skbuff = NULL; 1104 1102 1105 1103 /* Free Tx skb ringbuffer */ 1106 1104 if (mdp->tx_skbuff) { 1107 - for (i = 0; i < mdp->num_tx_ring; i++) { 1108 - if (mdp->tx_skbuff[i]) 1109 - dev_kfree_skb(mdp->tx_skbuff[i]); 1110 - } 1105 + for (i = 0; i < mdp->num_tx_ring; i++) 1106 + dev_kfree_skb(mdp->tx_skbuff[i]); 1111 1107 } 1112 1108 kfree(mdp->tx_skbuff); 1113 1109 mdp->tx_skbuff = NULL; ··· 2073 2077 rxdesc = &mdp->rx_ring[i]; 2074 2078 rxdesc->status = 0; 2075 2079 rxdesc->addr = 0xBADF00D0; 2076 - if (mdp->rx_skbuff[i]) 2077 - dev_kfree_skb(mdp->rx_skbuff[i]); 2080 + dev_kfree_skb(mdp->rx_skbuff[i]); 2078 2081 mdp->rx_skbuff[i] = NULL; 2079 2082 } 2080 2083 for (i = 0; i < mdp->num_tx_ring; i++) { 2081 - if (mdp->tx_skbuff[i]) 2082 - dev_kfree_skb(mdp->tx_skbuff[i]); 2084 + dev_kfree_skb(mdp->tx_skbuff[i]); 2083 2085 mdp->tx_skbuff[i] = NULL; 2084 2086 } 2085 2087