From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756861AbcIRGRF (ORCPT ); Sun, 18 Sep 2016 02:17:05 -0400 Received: from mout.web.de ([217.72.192.78]:53819 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754088AbcIRGQ5 (ORCPT ); Sun, 18 Sep 2016 02:16:57 -0400 Subject: [PATCH 05/10] firewire-net: Rename a jump label in fwnet_tx() To: linux1394-devel@lists.sourceforge.net, Stefan Richter References: <566ABCD9.1060404@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <5489efaa-fe38-5623-0faf-d0927ad32f50@users.sourceforge.net> Date: Sun, 18 Sep 2016 08:16:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:+S8KaE+ZTIiL3kZC5ywwRa2/aStyzTDERqqNQxsb5NIOP2vj/xD UGHl93gQoq53dpnoRKIQeJiXm74ptYcw3D0KZad5wy2jSC9SyiJI+8JIjurfMfv2caEUL/3 RfVL7yJn4U9uUSo10Sh5Vpde9C8KhnpHA1E2TVieHGFSsk3MrKyaQsdfcM8zL2oTenIzc+q WasmV+tIzDAxbVtQfsx2Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:NpWQIzzQJ6E=:Z0gG/Z6A9LatEzDBVvaZKA Pz6kmnZPuPqoLLMBcyrgadvLedg6+zqM6Lw3PjE57OsOvtiySlGpK96AhmW9u44FEUTd+V22/ bFInIlikJrWaYm0QVZz2Fd5BKdMhE7r/F77n+EYIjXgXqb/P8JfFMj61X0qEkRaY2TtfAlZW6 kOK4xJZmwPvI60lh9cqMIdR7bF+LM4t0OBfOZIBblmVQwk0ALdeYW7uvyPwJjM3tOpRo3tn25 WVpG7DjWRsvwJnvka3TN+TZz9TbccHfAwYIs6/pfijJF1J64mGMmEYmtj1EVY28cdRLKohG3z No/fwPf8mz0zdGm6DkyRNa5qeHotRv84SMSHQlzdmjF73gYRQQltFNmrdL0NhASjzIWusyIt1 CzhEW3qs75EvhGLg0Gbhv2q7FKbwa4DGpNbDByqrhn+85QbmWqBFGeiqBquErug5SoWHbf8J/ LVp4QMJVHMbbPRo2Qn954gWpdt8gditczx9cQjiUuYLHb8vlep9ce17peECRyXFYKN14v5Yy/ WleE7KySZHkJBh1KugJaRrXjbNLHs/eO1I8xs5NVl2ybVwt/ydodyRuViz9nVZiKLy/5B4USE XDB4/uljHuVudsok8E3x6fLrYOxrUja8+tJS8mZSS36MIrRzXo5hGdkxS4iTTW2GpdWI+kZhG OEt0+VZmyZLhf5NBw5bAlaIBOZBlKLl6HG0A4ryywYbJHqPhZ/IqflUliYIGb4FPRNzJfCbjX oC39RETK6iAwz5C6+KpUHHupWMf+RecemS4wkGgQAoaPF2jNnxsakUn1dyGvsF7wFVXoQMQoR gZaw9NK Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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