From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753350AbdAZKVe (ORCPT ); Thu, 26 Jan 2017 05:21:34 -0500 Received: from mout.web.de ([212.227.17.11]:62649 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752960AbdAZKUr (ORCPT ); Thu, 26 Jan 2017 05:20:47 -0500 Subject: [PATCH 4/5] gtp: Rename jump labels in gtp_encap_enable() To: netdev@vger.kernel.org, Alexey Dobriyan , "David S. Miller" , Harald Welte , Johannes Berg , Pablo Neira References: <698070a4-e08e-78e5-0214-df69783cce22@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <78c09980-bc36-f474-8a26-541f90ca55c4@users.sourceforge.net> Date: Thu, 26 Jan 2017 11:20:28 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <698070a4-e08e-78e5-0214-df69783cce22@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:J6a7qK5Zz6vIdtHBnj+NSakFh87Es2Zayv32utl0Y/TcqsLnpGb jssyXBMNKgFdyrjD2mU5XZNnCT3o01YEEWuXdcPdmYOHWANklme+roDw300BbY1X2z30fWV /sqYPuem2vGt7pPmW07/t9JqXfSKSZgTOVoS38BwmIyWb9sXhXfd8UWOxae6OXFcvS4fWBY n8ia5DndffaSZBRUz1ERQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:bK8lUeQaF9U=:m392xICMLEiT8PjwC+hbE2 l9HNtIOCQ4F1yQ4PI4wCvEr9tw0TWW98WIkXqcxp68ht+NFYlLiIoYqJV8rci2+ocAihvENfn xo2XUTsppLULVVgVtbHnP7ASAfnyBLvNSz9arHR46TxqgycZcD/CfunchryinyWBgBMWgPknn vP/SQEiQRdvux6GgDTY2wdB/7K5nqzjEqgIj2KSTWpTGmUFz8s3yVUR3LeWhLPtA53xF6a+Xl r9UOLVcbsKRG9qVpGUzpVGKnY1tgOVHteFB29uHECNPIHBfA0kfMtuY5uCmlf7lidukuEnY0Z duK356H1xBKRpt5Xlswgk8LtjwbEunvMf/58H4/2W5EuuZk9qMBMk9D3+bjEiNURzk+5vjJb6 wPKZ4/5/yxSUpcgTIqE932R798Z/w09KbURGXFqkHtlx9pGhukgL49Ss2plsWXQ1UKBArDRXt fcLVSOzV2My5hETOG5EK4y5DBVSEFPtrqfxpK7PiZy2D9ZCvmEGy6B2+k12vaZYUEloYtTaWH k0uw9PM5AdrxKotED+agzZM4/GmW4MJFzaxRy929/J0Z12e4YezC3DORoafVCGP56eUyjs4a6 ejQVl8ayQTUOsdcwnBCnwAhb1eXIV042M6wBMmF1x7y6O63LqTFyJdRFs+w0nKhTP73yjYcHB LpIxo6KA7sh2wxhF3sks29F14Kx1g0wLjdzSn5mrDFl35d9/8MoMrjUmvyoaMx9lqXRKuEPh8 P1/LGzfv6e0l4wsKRYzx/OuhdcFbvdODUokMcUNs0QnBMcXb4TTCe+SGbjr7tYI/5EO85Fd/y JLpf9Cp Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 26 Jan 2017 10:48:40 +0100 Adjust jump labels according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/net/gtp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index 7e38786361d8..2d4ddc000919 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -840,20 +840,20 @@ static int gtp_encap_enable(struct net_device *dev, struct gtp_dev *gtp, if (sock0->sk->sk_protocol != IPPROTO_UDP) { netdev_dbg(dev, "socket fd=%d not UDP\n", fd_gtp0); err = -EINVAL; - goto err1; + goto put_socket; } sock1u = sockfd_lookup(fd_gtp1, &err); if (!sock1u) { netdev_dbg(dev, "socket fd=%d not found (gtp1u)\n", fd_gtp1); err = -ENOENT; - goto err1; + goto put_socket; } if (sock1u->sk->sk_protocol != IPPROTO_UDP) { netdev_dbg(dev, "socket fd=%d not UDP\n", fd_gtp1); err = -EINVAL; - goto err2; + goto put_socket_u; } netdev_dbg(dev, "enable gtp on %p, %p\n", sock0, sock1u); @@ -873,9 +873,9 @@ static int gtp_encap_enable(struct net_device *dev, struct gtp_dev *gtp, setup_udp_tunnel_sock(sock_net(gtp->sock1u->sk), gtp->sock1u, &tuncfg); err = 0; -err2: +put_socket_u: sockfd_put(sock1u); -err1: +put_socket: sockfd_put(sock0); return err; } -- 2.11.0