lkml.org 
[lkml]   [2016]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 05/10] firewire-net: Rename a jump label in fwnet_tx()
    From
    Date
    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
    \
     
     \ /
      Last update: 2016-09-18 08:17    [W:4.025 / U:1.344 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site