Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1567283

[PATCH 4/5] gtp: Rename jump labels in gtp_encap_enable()

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] GTP: Fine-tuning for some function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-26 11:20 +0100
  [PATCH 1/5] gtp: Use kmalloc_array() in gtp_hashtable_new() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-26 11:20 +0100
  [PATCH 4/5] gtp: Rename jump labels in gtp_encap_enable() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-26 11:30 +0100
  [PATCH 5/5] gtp: Rename jump labels in gtp_hashtable_new() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-26 11:30 +0100
  [PATCH 2/5] gtp: Improve another size determination in ipv4_pdp_add() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-26 11:30 +0100
    Re: [PATCH 2/5] gtp: Improve another size determination in ipv4_pdp_add() Alexey Dobriyan <adobriyan@gmail.com> - 2017-01-26 14:20 +0100
  [PATCH 3/5] gtp: Adjust 12 checks for null pointers SF Markus Elfring <elfring@users.sourceforge.net> - 2017-01-26 11:30 +0100
  Re: [PATCH 0/5] GTP: Fine-tuning for some function implementations Andreas Schultz <aschultz@tpip.net> - 2017-01-26 12:30 +0100

csiph-web