lkml.org 
[lkml]   [2018]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 076/105] can: peak/pcie_fd: remove useless code when interface starts
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stephane Grosjean <s.grosjean@peak-system.com>

    commit ffd137f7043cb30067e1bff6fe62a073ae190b23 upstream.

    When an interface starts, the echo_skb array is empty and the network
    queue should be started only. This patch replaces useless code and locks
    when the internal RX_BARRIER message is received from the IP core, telling
    the driver that tx may start.

    Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
    Cc: linux-stable <stable@vger.kernel.org>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/can/peak_canfd/peak_canfd.c | 13 ++-----------
    1 file changed, 2 insertions(+), 11 deletions(-)

    --- a/drivers/net/can/peak_canfd/peak_canfd.c
    +++ b/drivers/net/can/peak_canfd/peak_canfd.c
    @@ -333,7 +333,6 @@ static int pucan_handle_status(struct pe

    /* this STATUS is the CNF of the RX_BARRIER: Tx path can be setup */
    if (pucan_status_is_rx_barrier(msg)) {
    - unsigned long flags;

    if (priv->enable_tx_path) {
    int err = priv->enable_tx_path(priv);
    @@ -342,16 +341,8 @@ static int pucan_handle_status(struct pe
    return err;
    }

    - /* restart network queue only if echo skb array is free */
    - spin_lock_irqsave(&priv->echo_lock, flags);
    -
    - if (!priv->can.echo_skb[priv->echo_idx]) {
    - spin_unlock_irqrestore(&priv->echo_lock, flags);
    -
    - netif_wake_queue(ndev);
    - } else {
    - spin_unlock_irqrestore(&priv->echo_lock, flags);
    - }
    + /* start network queue (echo_skb array is empty) */
    + netif_start_queue(ndev);

    return 0;
    }

    \
     
     \ /
      Last update: 2018-03-27 18:45    [W:2.712 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site