cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
53 lines
1.8 KiB
Diff
53 lines
1.8 KiB
Diff
From 88b21e30646ba263df647469c3af8c09e43a99d6 Mon Sep 17 00:00:00 2001
|
|
From: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
Date: Mon, 7 Oct 2019 13:36:58 +0200
|
|
Subject: [PATCH] can: rx-offload: can_rx_offload_reset(): remove no-op
|
|
function
|
|
|
|
This patch removes the function can_rx_offload_reset(), as it does
|
|
nothing. If we ever need this function, add it back again.
|
|
|
|
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
|
|
---
|
|
drivers/net/can/rx-offload.c | 7 -------
|
|
include/linux/can/rx-offload.h | 1 -
|
|
2 files changed, 8 deletions(-)
|
|
|
|
--- a/drivers/net/can/rx-offload.c
|
|
+++ b/drivers/net/can/rx-offload.c
|
|
@@ -348,7 +348,6 @@ static int can_rx_offload_init_queue(str
|
|
offload->skb_queue_len_max *= 4;
|
|
skb_queue_head_init(&offload->skb_queue);
|
|
|
|
- can_rx_offload_reset(offload);
|
|
netif_napi_add(dev, &offload->napi, can_rx_offload_napi_poll, weight);
|
|
|
|
dev_dbg(dev->dev.parent, "%s: skb_queue_len_max=%d\n",
|
|
@@ -390,7 +389,6 @@ EXPORT_SYMBOL_GPL(can_rx_offload_add_fif
|
|
|
|
void can_rx_offload_enable(struct can_rx_offload *offload)
|
|
{
|
|
- can_rx_offload_reset(offload);
|
|
napi_enable(&offload->napi);
|
|
}
|
|
EXPORT_SYMBOL_GPL(can_rx_offload_enable);
|
|
@@ -401,8 +399,3 @@ void can_rx_offload_del(struct can_rx_of
|
|
skb_queue_purge(&offload->skb_queue);
|
|
}
|
|
EXPORT_SYMBOL_GPL(can_rx_offload_del);
|
|
-
|
|
-void can_rx_offload_reset(struct can_rx_offload *offload)
|
|
-{
|
|
-}
|
|
-EXPORT_SYMBOL_GPL(can_rx_offload_reset);
|
|
--- a/include/linux/can/rx-offload.h
|
|
+++ b/include/linux/can/rx-offload.h
|
|
@@ -44,7 +44,6 @@ unsigned int can_rx_offload_get_echo_skb
|
|
unsigned int idx, u32 timestamp);
|
|
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);
|
|
|