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


Groups > linux.kernel > #1485698

[PATCH 05/10] firewire-net: Rename a jump label in fwnet_tx()

From SF Markus Elfring <elfring@users.sourceforge.net>
Newsgroups linux.kernel
Subject [PATCH 05/10] firewire-net: Rename a jump label in fwnet_tx()
Date 2016-09-18 08:20 +0200
Message-ID <siDCh-4sb-7@gated-at.bofh.it> (permalink)
References <qEuGl-43C-5@gated-at.bofh.it> <siDsB-4oB-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 17 Sep 2016 22:22:58 +0200

Adjust jump labels according to the current Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/firewire/net.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c
index 2ca2d57..24725be 100644
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
@@ -1233,11 +1233,11 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
 
 	ptask = kmem_cache_alloc(fwnet_packet_task_cache, GFP_ATOMIC);
 	if (ptask == NULL)
-		goto fail;
+		goto unlock;
 
 	skb = skb_share_check(skb, GFP_ATOMIC);
 	if (!skb)
-		goto fail;
+		goto unlock;
 
 	/*
 	 * Make a copy of the driver-specific header.
@@ -1254,7 +1254,7 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
 #endif
 		break;
 	default:
-		goto fail;
+		goto unlock;
 	}
 
 	skb_pull(skb, sizeof(hdr_buf));
@@ -1279,7 +1279,7 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
 
 		peer = fwnet_peer_find_by_guid(dev, be64_to_cpu(guid));
 		if (!peer)
-			goto fail;
+			goto unlock;
 
 		generation         = peer->generation;
 		dest_node          = peer->node_id;
@@ -1324,8 +1324,7 @@ static netdev_tx_t fwnet_tx(struct sk_buff *skb, struct net_device *net)
 	fwnet_send_packet(ptask);
 
 	return NETDEV_TX_OK;
-
- fail:
+ unlock:
 	spin_unlock_irqrestore(&dev->lock, flags);
 
 	if (ptask)
-- 
2.10.0

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


Thread

[PATCH 00/10] firewire-net: Fine-tuning for several function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:10 +0200
  [PATCH 03/10] firewire-net: Rename jump labels in fwnet_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 04/10] firewire-net: Rename jump labels in fwnet_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 02/10] firewire-net: Rename a jump label in  fwnet_broadcast_start() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 05/10] firewire-net: Rename a jump label in fwnet_tx() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 06/10] firewire-net: Rename a jump label in  fwnet_send_packet() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 07/10] firewire-net: Rename a jump label in  fwnet_incoming_packet() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 01/] firewire-net: Use kmalloc_array() in  fwnet_broadcast_start() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:20 +0200
  [PATCH 09/10] firewire-net: Rename jump labels in fwnet_pd_new() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:30 +0200
  [PATCH 08/10] firewire-net: Rename a jump label in  fwnet_finish_incoming_packet() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:30 +0200
  [PATCH 10/10] firewire-net: Adjust checks for null pointers in five  functions SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-18 08:30 +0200

csiph-web