lkml.org 
[lkml]   [2010]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] staging: ft1000: Use common return point.
    Date
    Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
    ---
    drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 23 +++++++++--------------
    1 files changed, 9 insertions(+), 14 deletions(-)

    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    index 9bb5377..0de4a2e 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    @@ -1121,14 +1121,13 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
    if ( skb == NULL )
    {
    DEBUG ("ft1000_hw: ft1000_start_xmit:skb == NULL!!!\n" );
    - return STATUS_FAILURE;
    + return NETDEV_TX_OK;
    }

    if ( pFt1000Dev->status & FT1000_STATUS_CLOSING)
    {
    DEBUG("network driver is closed, return\n");
    - dev_kfree_skb(skb);
    - return STATUS_SUCCESS;
    + goto err;
    }

    //DEBUG("ft1000_start_xmit 1:length of packet = %d\n", skb->len);
    @@ -1147,28 +1146,24 @@ static int ft1000_start_xmit(struct sk_buff *skb, struct net_device *dev)
    {
    /* Drop packet is mediastate is down */
    DEBUG("ft1000_hw:ft1000_start_xmit:mediastate is down\n");
    - dev_kfree_skb(skb);
    - return STATUS_SUCCESS;
    + goto err;
    }

    if ( (skb->len < ENET_HEADER_SIZE) || (skb->len > ENET_MAX_SIZE) )
    {
    /* Drop packet which has invalid size */
    DEBUG("ft1000_hw:ft1000_start_xmit:invalid ethernet length\n");
    - dev_kfree_skb(skb);
    - return STATUS_SUCCESS;
    + goto err;
    }
    //mbelian
    - if(ft1000_copy_down_pkt (dev, (pdata+ENET_HEADER_SIZE-2), skb->len - ENET_HEADER_SIZE + 2) == STATUS_FAILURE)
    - {
    - dev_kfree_skb(skb);
    - return STATUS_SUCCESS;
    - }
    + ft1000_copy_down_pkt(dev, (pdata+ENET_HEADER_SIZE-2),
    + skb->len - ENET_HEADER_SIZE + 2);

    - dev_kfree_skb(skb);
    +err:
    + dev_kfree_skb(skb);
    //DEBUG(" ft1000_start_xmit() exit\n");

    - return 0;
    + return NETDEV_TX_OK;
    }

    //---------------------------------------------------------------------------
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-11-02 14:53    [W:0.025 / U:29.256 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site