lkml.org 
[lkml]   [2018]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 041/100] can: rx-offload: rename can_rx_offload_irq_queue_err_skb() to can_rx_offload_queue_tail()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: Oleksij Rempel <o.rempel@pengutronix.de>

    commit 4530ec36bb1e0d24f41c33229694adacda3d5d89 upstream.

    This function has nothing todo with error.

    Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
    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/flexcan.c | 4 ++--
    drivers/net/can/rx-offload.c | 5 +++--
    include/linux/can/rx-offload.h | 3 ++-
    3 files changed, 7 insertions(+), 5 deletions(-)

    --- a/drivers/net/can/flexcan.c
    +++ b/drivers/net/can/flexcan.c
    @@ -599,7 +599,7 @@ static void flexcan_irq_bus_err(struct n
    if (tx_errors)
    dev->stats.tx_errors++;

    - can_rx_offload_irq_queue_err_skb(&priv->offload, skb);
    + can_rx_offload_queue_tail(&priv->offload, skb);
    }

    static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)
    @@ -639,7 +639,7 @@ static void flexcan_irq_state(struct net
    if (unlikely(new_state == CAN_STATE_BUS_OFF))
    can_bus_off(dev);

    - can_rx_offload_irq_queue_err_skb(&priv->offload, skb);
    + can_rx_offload_queue_tail(&priv->offload, skb);
    }

    static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)
    --- a/drivers/net/can/rx-offload.c
    +++ b/drivers/net/can/rx-offload.c
    @@ -255,7 +255,8 @@ unsigned int can_rx_offload_get_echo_skb
    }
    EXPORT_SYMBOL_GPL(can_rx_offload_get_echo_skb);

    -int can_rx_offload_irq_queue_err_skb(struct can_rx_offload *offload, struct sk_buff *skb)
    +int can_rx_offload_queue_tail(struct can_rx_offload *offload,
    + struct sk_buff *skb)
    {
    if (skb_queue_len(&offload->skb_queue) >
    offload->skb_queue_len_max)
    @@ -266,7 +267,7 @@ int can_rx_offload_irq_queue_err_skb(str

    return 0;
    }
    -EXPORT_SYMBOL_GPL(can_rx_offload_irq_queue_err_skb);
    +EXPORT_SYMBOL_GPL(can_rx_offload_queue_tail);

    static int can_rx_offload_init_queue(struct net_device *dev, struct can_rx_offload *offload, unsigned int weight)
    {
    --- a/include/linux/can/rx-offload.h
    +++ b/include/linux/can/rx-offload.h
    @@ -45,7 +45,8 @@ int can_rx_offload_queue_sorted(struct c
    struct sk_buff *skb, u32 timestamp);
    unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload,
    unsigned int idx, u32 timestamp);
    -int can_rx_offload_irq_queue_err_skb(struct can_rx_offload *offload, struct sk_buff *skb);
    +int can_rx_offload_queue_tail(struct can_rx_offload *offload,
    + struct sk_buff *skb);
    void can_rx_offload_reset(struct can_rx_offload *offload);
    void can_rx_offload_del(struct can_rx_offload *offload);
    void can_rx_offload_enable(struct can_rx_offload *offload);

    \
     
     \ /
      Last update: 2018-11-29 15:49    [W:4.140 / U:25.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site