From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751443AbdJ1OdM (ORCPT ); Sat, 28 Oct 2017 10:33:12 -0400 Received: from mout.web.de ([217.72.192.78]:60017 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751189AbdJ1OdI (ORCPT ); Sat, 28 Oct 2017 10:33:08 -0400 To: netdev@vger.kernel.org, Chris Snook , "David S. Miller" , Eric Dumazet , Geliang Tang , Jay Cliburn , Philippe Reynes Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] net: atheros: atl1: Use common error handling code in atl1_xmit_frame() Message-ID: <4b3b7535-6ea0-b4fe-404a-de800b838e4f@users.sourceforge.net> Date: Sat, 28 Oct 2017 16:32:55 +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:AbItRJrF1T6ttAnt6MlREgkOr6YTAQd96rum9uXfWkb1xoex2Bc lpTP42tjn/kx7ZGwOJ4D5L0fQ4mbxpKHAVGL5xNK8IvMVi4ArFM//OfmdfbiH1nsIjPS479 rpfYykCao5/kDyuJL+zrqAsUK2O3vZP0wZhEammh6zBLss/uaTN+zk1DvPWMO8N/uTbLN// u/WkLDgN9go7MkacyilhQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:dg3BdGjkaEg=:vPXqkN4BP1Z/vL51Sf3eMk 6ZD8UK4fikz/2myscjXEbeEQvsSFteD204tAfxeEDksvG3KQr4YqisiU6i+pTc6HXvjQgybeM GZ7XE0uiXwyJFFua2rUlj/DBkQpv148k9YX/R7ZLWD17wS8U3ksM4y2EBMaGOP3Ep6ym87cBE UQ2veM7NWJZEgDme+22HBWslF+lmeqaBLKxInKXLIdbmB2gmeU0CVgQrha1OwLNuOpI6B9o2A ZQ6A5xZL8RAN2k4/fiwblr2hwEAWqBuv334LBtsyzpa1+f3RtX6HTcl0u42OoLwTy+nNX0hnL w0ZI4Pf2daxabDSLUArNzqG1L0/3CeZzILluOXk2nwl0J+emjpgjYPGYp9vcnsks6zSfukNrZ 2yr6HG/SbTIlk02pD/TUhaqUCIUlj8vw+UOYjhSL09FweiIUOP1qb1IiNq2UamvJaPwD3h285 99SXgL0PDJ+DcmWnWZ9htVGwKzi11ItU2a3bmLVwwL2awz96ITYfUwtflGB19PGauIewCHyLo /mt3eloCJzM47eJU/Q6vTjhJ3boYKWGl5t9Vdyp6HHxZ6uY7CMTDPeOk1upaUUALcSM/jjQro yD80vpM5byjYiMPVaSAyFxSYgAxidqiSuPZZ71w22sNLhy3dB9rpBgUFyL+++I1FPuD5dmSVF 47nRVIaBYtj1K2w/3HJmiUsLAEqLU0fpqBjYTa3gxsEKfZ2OEMTq11aNNqoMCtV6wdxtR8DSu vk2JAhkkyYY3qXAHHRU4wX2f3uh1dNQLVQdxKoQeE2Q9nhnFkMwkb1DdJ7COMb9f1jYPgVcrB TXyKS2Qwuau+h9xGjijJ6hyIBBVhJwTYEt7v3Kw2kVATtHmJzc= 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 16:22:30 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/net/ethernet/atheros/atlx/atl1.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 83d2db2abb45..030dac9c06aa 100644 --- a/drivers/net/ethernet/atheros/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c @@ -2424,17 +2424,13 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb, } tso = atl1_tso(adapter, skb, ptpd); - if (tso < 0) { - dev_kfree_skb_any(skb); - return NETDEV_TX_OK; - } + if (tso < 0) + goto free_skb; if (!tso) { ret_val = atl1_tx_csum(adapter, skb, ptpd); - if (ret_val < 0) { - dev_kfree_skb_any(skb); - return NETDEV_TX_OK; - } + if (ret_val < 0) + goto free_skb; } atl1_tx_map(adapter, skb, ptpd); @@ -2442,6 +2438,10 @@ static netdev_tx_t atl1_xmit_frame(struct sk_buff *skb, atl1_update_mailbox(adapter); mmiowb(); return NETDEV_TX_OK; + +free_skb: + dev_kfree_skb_any(skb); + return NETDEV_TX_OK; } static int atl1_rings_clean(struct napi_struct *napi, int budget) -- 2.14.3