From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751392AbdJ1QXa (ORCPT ); Sat, 28 Oct 2017 12:23:30 -0400 Received: from mout.web.de ([217.72.192.78]:54561 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751189AbdJ1QX1 (ORCPT ); Sat, 28 Oct 2017 12:23:27 -0400 To: netdev@vger.kernel.org, "David S. Miller" , Eric Dumazet , Philippe Reynes , Stephen Hemminger , Zhu Yanjun Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] forcedeth: Use common error handling code in two functions Message-ID: Date: Sat, 28 Oct 2017 18:23:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:z7KlZ8wwf8jq91sRKO7JaNaYCchGsKioRbH7c546vp2rr5gFU0p 0PzdGP5ssyQ/apVMBUSGPlrq0Ecip3OahGavN1MmylRHoW8N3ZIP/P7HyMLAxf7dpshzhCd GD+MNV6sfY6WxqHAYuGF40GO8lVUeFys9zf9sMfXfPKHEAyVoYGqGLax86nYrangTrvJeTu NA3o9KfA9yTDL9XheliFQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:aENyJSEprqo=:XVczjd/T2MiIm195f3HSGC AW+z4c0WRXW7kTZegvhFypZUmrxgOyJUAygJHdUmJ5sg9oVP0wdf6jKqh/DnNfGLVElN+YXNW KZYpAvQ0R3GX60SPONHKsw7FA7rVrz/tt6ey1CvVKzIz93frcjzmROY9TNZ4MqQ63fglciYSN Y1F4CBkyp8aGaXBPmSmzDLfsWTux4fcwhTQGaYENyWtoEG+hx2D6kUxHL6lZZOIOFtirwNAZg xNUO5gcnWO/ntqzhNyOK52D9USpExWppwX4LlptIMo0gfHe0/AVjiZh49E0j9tg5pWsN1lEpf sM52luq3jOMEe5DVjMh7FHluAmhyGfwI4cMhu7b9Kp0JrXChK5twhxXAnDQxYYAMFJEglAGcv YMjT/Q7V7OBrld8e2wjgHB/cSkQ+3DIvEHDSVXljFDPDQJa6qGXZZyDfqocCjXJmU6kxjDyb1 nZxjG8UpyETRVh29MI8KaSSCJQvr3qN3eFF4z9mtoXlfI7um9BFVM9S7jCN2yuxzZjbTODU1M gYYH5uGm48d1XP485z69SNLz2s+0jaJPLrhTilX/irLyD+unlOM9nkwAhjHpc+9Em7LNLDA0B cEw8XZaJSyHcVsno1rFs9y5E7m0yoLKLVchya1fuwTdCvkJgozNiixKkZJc6f7phfFE/ei8fo XAk4Q3KwYSm2R4va05LC5788E4fLemFT/nmDsO1jZjpWR1hi0NFOkU4qAtRA538pKMPa+8NXb Sldq1IHihsOwtQ94Y4fRX8zUfd2s+1dMnBdxlqDvHVEpLdK8nD6imAD65agya92rim6wBD0Z/ 2KH+nqJoaToIYVMDCYnp9VvDB6GwxT63jzMEFkeTd3SpXSfGik= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 28 Oct 2017 18:15:44 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/net/ethernet/nvidia/forcedeth.c | 42 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index a235e8881af9..08dc2e8e5878 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c @@ -2827,10 +2827,8 @@ static int nv_rx_process(struct net_device *dev, int limit) if (unlikely(flags & NV_RX_ERROR)) { if ((flags & NV_RX_ERROR_MASK) == NV_RX_ERROR4) { len = nv_getlen(dev, skb->data, len); - if (len < 0) { - dev_kfree_skb(skb); - goto next_pkt; - } + if (len < 0) + goto next_free_skb; } /* framing errors are soft errors */ else if ((flags & NV_RX_ERROR_MASK) == NV_RX_FRAMINGERR) { @@ -2844,13 +2842,12 @@ static int nv_rx_process(struct net_device *dev, int limit) np->stat_rx_missed_errors++; u64_stats_update_end(&np->swstats_rx_syncp); } - dev_kfree_skb(skb); - goto next_pkt; + + goto next_free_skb; } } } else { - dev_kfree_skb(skb); - goto next_pkt; + goto next_free_skb; } } else { if (likely(flags & NV_RX2_DESCRIPTORVALID)) { @@ -2858,10 +2855,8 @@ static int nv_rx_process(struct net_device *dev, int limit) if (unlikely(flags & NV_RX2_ERROR)) { if ((flags & NV_RX2_ERROR_MASK) == NV_RX2_ERROR4) { len = nv_getlen(dev, skb->data, len); - if (len < 0) { - dev_kfree_skb(skb); - goto next_pkt; - } + if (len < 0) + goto next_free_skb; } /* framing errors are soft errors */ else if ((flags & NV_RX2_ERROR_MASK) == NV_RX2_FRAMINGERR) { @@ -2870,16 +2865,14 @@ static int nv_rx_process(struct net_device *dev, int limit) } /* the rest are hard errors */ else { - dev_kfree_skb(skb); - goto next_pkt; + goto next_free_skb; } } if (((flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUM_IP_TCP) || /*ip and tcp */ ((flags & NV_RX2_CHECKSUMMASK) == NV_RX2_CHECKSUM_IP_UDP)) /*ip and udp */ skb->ip_summed = CHECKSUM_UNNECESSARY; } else { - dev_kfree_skb(skb); - goto next_pkt; + goto next_free_skb; } } /* got a valid packet - forward it to the network core */ @@ -2900,6 +2893,10 @@ static int nv_rx_process(struct net_device *dev, int limit) } return rx_work; + +next_free_skb: + dev_kfree_skb(skb); + goto next_pkt; } static int nv_rx_process_optimized(struct net_device *dev, int limit) @@ -2932,10 +2929,8 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit) if (unlikely(flags & NV_RX2_ERROR)) { if ((flags & NV_RX2_ERROR_MASK) == NV_RX2_ERROR4) { len = nv_getlen(dev, skb->data, len); - if (len < 0) { - dev_kfree_skb(skb); - goto next_pkt; - } + if (len < 0) + goto next_free_skb; } /* framing errors are soft errors */ else if ((flags & NV_RX2_ERROR_MASK) == NV_RX2_FRAMINGERR) { @@ -2944,8 +2939,7 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit) } /* the rest are hard errors */ else { - dev_kfree_skb(skb); - goto next_pkt; + goto next_free_skb; } } @@ -2989,6 +2983,10 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit) } return rx_work; + +next_free_skb: + dev_kfree_skb(skb); + goto next_pkt; } static void set_bufsize(struct net_device *dev) -- 2.14.3