git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 4530ec36bb1e0d24f41c33229694adacda3d5d89 Mon Sep 17 00:00:00 2001
   2 From: Oleksij Rempel <o.rempel@pengutronix.de>
   3 Date: Tue, 18 Sep 2018 11:40:40 +0200
   4 Subject: can: rx-offload: rename can_rx_offload_irq_queue_err_skb() to can_rx_offload_queue_tail()
   5
   6 From: Oleksij Rempel <o.rempel@pengutronix.de>
   7
   8 commit 4530ec36bb1e0d24f41c33229694adacda3d5d89 upstream.
   9
  10 This function has nothing todo with error.
  11
  12 Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
  13 Cc: linux-stable <stable@vger.kernel.org>
  14 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  16
  17 ---
  18  drivers/net/can/flexcan.c      |    4 ++--
  19  drivers/net/can/rx-offload.c   |    5 +++--
  20  include/linux/can/rx-offload.h |    3 ++-
  21  3 files changed, 7 insertions(+), 5 deletions(-)
  22
  23 --- a/drivers/net/can/flexcan.c
  24 +++ b/drivers/net/can/flexcan.c
  25 @@ -599,7 +599,7 @@ static void flexcan_irq_bus_err(struct n
  26         if (tx_errors)
  27                 dev->stats.tx_errors++;
  28
  29 -       can_rx_offload_irq_queue_err_skb(&priv->offload, skb);
  30 +       can_rx_offload_queue_tail(&priv->offload, skb);
  31  }
  32
  33  static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)
  34 @@ -639,7 +639,7 @@ static void flexcan_irq_state(struct net
  35         if (unlikely(new_state == CAN_STATE_BUS_OFF))
  36                 can_bus_off(dev);
  37
  38 -       can_rx_offload_irq_queue_err_skb(&priv->offload, skb);
  39 +       can_rx_offload_queue_tail(&priv->offload, skb);
  40  }
  41
  42  static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)
  43 --- a/drivers/net/can/rx-offload.c
  44 +++ b/drivers/net/can/rx-offload.c
  45 @@ -255,7 +255,8 @@ unsigned int can_rx_offload_get_echo_skb
  46  }
  47  EXPORT_SYMBOL_GPL(can_rx_offload_get_echo_skb);
  48
  49 -int can_rx_offload_irq_queue_err_skb(struct can_rx_offload *offload, struct sk_buff *skb)
  50 +int can_rx_offload_queue_tail(struct can_rx_offload *offload,
  51 +                             struct sk_buff *skb)
  52  {
  53         if (skb_queue_len(&offload->skb_queue) >
  54             offload->skb_queue_len_max)
  55 @@ -266,7 +267,7 @@ int can_rx_offload_irq_queue_err_skb(str
  56
  57         return 0;
  58  }
  59 -EXPORT_SYMBOL_GPL(can_rx_offload_irq_queue_err_skb);
  60 +EXPORT_SYMBOL_GPL(can_rx_offload_queue_tail);
  61
  62  static int can_rx_offload_init_queue(struct net_device *dev, struct can_rx_offload *offload, unsigned int weight)
  63  {
  64 --- a/include/linux/can/rx-offload.h
  65 +++ b/include/linux/can/rx-offload.h
  66 @@ -45,7 +45,8 @@ int can_rx_offload_queue_sorted(struct c
  67                                 struct sk_buff *skb, u32 timestamp);
  68  unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload,
  69                                          unsigned int idx, u32 timestamp);
  70 -int can_rx_offload_irq_queue_err_skb(struct can_rx_offload *offload, struct sk_buff *skb);
  71 +int can_rx_offload_queue_tail(struct can_rx_offload *offload,
  72 +                             struct sk_buff *skb);
  73  void can_rx_offload_reset(struct can_rx_offload *offload);
  74  void can_rx_offload_del(struct can_rx_offload *offload);
  75  void can_rx_offload_enable(struct can_rx_offload *offload);