From: SF Markus Elfring <elfring@users.sourceforge.net>
To: netdev@vger.kernel.org, Alexey Dobriyan <adobriyan@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Harald Welte <laforge@gnumonks.org>,
Johannes Berg <johannes.berg@intel.com>,
Pablo Neira <pablo@netfilter.org>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 4/5] gtp: Rename jump labels in gtp_encap_enable()
Date: Thu, 26 Jan 2017 11:20:28 +0100 [thread overview]
Message-ID: <78c09980-bc36-f474-8a26-541f90ca55c4@users.sourceforge.net> (raw)
In-Reply-To: <698070a4-e08e-78e5-0214-df69783cce22@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 26 Jan 2017 10:48:40 +0100
Adjust jump labels according to the Linux coding style convention.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
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
next prev parent reply other threads:[~2017-01-26 10:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-26 10:15 [PATCH 0/5] GTP: Fine-tuning for some function implementations SF Markus Elfring
2017-01-26 10:17 ` [PATCH 1/5] gtp: Use kmalloc_array() in gtp_hashtable_new() SF Markus Elfring
2017-01-26 10:18 ` [PATCH 2/5] gtp: Improve another size determination in ipv4_pdp_add() SF Markus Elfring
2017-01-26 13:11 ` Alexey Dobriyan
2017-01-26 10:19 ` [PATCH 3/5] gtp: Adjust 12 checks for null pointers SF Markus Elfring
2017-01-26 10:20 ` SF Markus Elfring [this message]
2017-01-26 10:22 ` [PATCH 5/5] gtp: Rename jump labels in gtp_hashtable_new() SF Markus Elfring
2017-01-26 11:14 ` [PATCH 0/5] GTP: Fine-tuning for some function implementations Andreas Schultz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=78c09980-bc36-f474-8a26-541f90ca55c4@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=adobriyan@gmail.com \
--cc=davem@davemloft.net \
--cc=johannes.berg@intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=laforge@gnumonks.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).