aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/788-v5.12-r8152-replace-netif_err-with-dev_err.patch
diff options
context:
space:
mode:
authorAleksander Jan Bajkowski <olek2@wp.pl>2022-03-09 20:52:50 +0100
committerChristian Lamparter <chunkeey@gmail.com>2022-03-25 18:14:13 +0100
commit210c534ce2be55fc0c59b1700809470e8ba971b8 (patch)
treeb555f33567575ac3a2b7da70cbef4404cac3248d /target/linux/generic/backport-5.10/788-v5.12-r8152-replace-netif_err-with-dev_err.patch
parentdd45cc2123b75abb0b41eb90c21d8d3506f2a3c2 (diff)
downloadupstream-210c534ce2be55fc0c59b1700809470e8ba971b8.tar.gz
upstream-210c534ce2be55fc0c59b1700809470e8ba971b8.tar.bz2
upstream-210c534ce2be55fc0c59b1700809470e8ba971b8.zip
kernel: move rtl8152 patches to generic
This commit moves the patches for the r8152.c driver to the generic directory. Previously they were only available on the bcm27xx target. With these patches the Realtek RTL8153C, RTL8153D, RTL8156A and RTL8156B chips are supported on all targets by the kmod-usb-net-rtl8152 module. The RTL8156A and RTL8156B are the 2.5Gb/s Ethernet adapters. The patches have been tested on TP-Link UE300 (RTL8153A) and UNITEK 1313B (RTL8156B). Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl>
Diffstat (limited to 'target/linux/generic/backport-5.10/788-v5.12-r8152-replace-netif_err-with-dev_err.patch')
-rw-r--r--target/linux/generic/backport-5.10/788-v5.12-r8152-replace-netif_err-with-dev_err.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/generic/backport-5.10/788-v5.12-r8152-replace-netif_err-with-dev_err.patch b/target/linux/generic/backport-5.10/788-v5.12-r8152-replace-netif_err-with-dev_err.patch
new file mode 100644
index 0000000000..967b4ccc16
--- /dev/null
+++ b/target/linux/generic/backport-5.10/788-v5.12-r8152-replace-netif_err-with-dev_err.patch
@@ -0,0 +1,36 @@
+From 38e44c7926512cff0b2809dc329de2a8e769e523 Mon Sep 17 00:00:00 2001
+From: Hayes Wang <hayeswang@realtek.com>
+Date: Fri, 19 Feb 2021 17:04:42 +0800
+Subject: [PATCH] r8152: replace netif_err with dev_err
+
+commit 156c3207611262266f0eea589ac3f00c5657320e upstream.
+
+Some messages are before calling register_netdev(), so replace
+netif_err() with dev_err().
+
+Signed-off-by: Hayes Wang <hayeswang@realtek.com>
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+---
+ drivers/net/usb/r8152.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/usb/r8152.c
++++ b/drivers/net/usb/r8152.c
+@@ -6594,7 +6594,7 @@ static int rtl_ops_init(struct r8152 *tp
+
+ default:
+ ret = -ENODEV;
+- netif_err(tp, probe, tp->netdev, "Unknown Device\n");
++ dev_err(&tp->intf->dev, "Unknown Device\n");
+ break;
+ }
+
+@@ -6851,7 +6851,7 @@ static int rtl8152_probe(struct usb_inte
+
+ ret = register_netdev(netdev);
+ if (ret != 0) {
+- netif_err(tp, probe, netdev, "couldn't register the device\n");
++ dev_err(&intf->dev, "couldn't register the device\n");
+ goto out1;
+ }
+