diff for duplicates of <1394712342-15778-341-Taiwan-albertk@realtek.com>
diff --git a/a/1.txt b/N1/1.txt
index 839d7b9..96032ab 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,37 +1,13 @@
-Initailization would reset runtime suspend by tp->saved_wolopts, so
-the tp->saved_wolopts should be set before initializing.
+These patches are used to adjust the code.
-Signed-off-by: Hayes Wang <hayeswang@realtek.com>
----
- drivers/net/usb/r8152.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
+Hayes Wang (4):
+ r8152: enable U1/U2 for USB_SPEED_SUPER
+ r8152: check if the pointer of the function exists
+ r8152: replace netif_err with dev_err
+ r8152: spilt rtl_set_eee_plus and r8153b_green_en
+
+ drivers/net/usb/r8152.c | 67 ++++++++++++++++++++++++++++-------------
+ 1 file changed, 46 insertions(+), 21 deletions(-)
-diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
-index 64efd58279b3..e29e1a13e811 100644
---- a/drivers/net/usb/r8152.c
-+++ b/drivers/net/usb/r8152.c
-@@ -6738,6 +6738,11 @@ static int rtl8152_probe(struct usb_interface *intf,
-
- intf->needs_remote_wakeup = 1;
-
-+ if (!rtl_can_wakeup(tp))
-+ __rtl_set_wol(tp, 0);
-+ else
-+ tp->saved_wolopts = __rtl_get_wol(tp);
-+
- tp->rtl_ops.init(tp);
- #if IS_BUILTIN(CONFIG_USB_RTL8152)
- /* Retry in case request_firmware() is not ready yet. */
-@@ -6755,10 +6760,6 @@ static int rtl8152_probe(struct usb_interface *intf,
- goto out1;
- }
-
-- if (!rtl_can_wakeup(tp))
-- __rtl_set_wol(tp, 0);
--
-- tp->saved_wolopts = __rtl_get_wol(tp);
- if (tp->saved_wolopts)
- device_set_wakeup_enable(&udev->dev, true);
- else
--
-2.21.0
\ No newline at end of file
+2.26.2
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index a74468c..ed82a2b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,14 +1,11 @@
-[
- "ref\0001394712342-15778-338-Taiwan-albertk\@realtek.com\0"
-]
[
"From\0Hayes Wang <hayeswang\@realtek.com>\0"
]
[
- "Subject\0[PATCH net 3/9] r8152: get default setting of WOL before initializing\0"
+ "Subject\0[PATCH net-next 0/4] r8152: minor adjustments\0"
]
[
- "Date\0Tue, 21 Jan 2020 20:40:29 +0800\0"
+ "Date\0Fri, 19 Feb 2021 17:04:39 +0800\0"
]
[
"To\0<netdev\@vger.kernel.org>\0"
@@ -17,8 +14,6 @@
"Cc\0<nic_swsd\@realtek.com>",
" <linux-kernel\@vger.kernel.org>",
" <linux-usb\@vger.kernel.org>",
- " <pmalani\@chromium.org>",
- " <grundler\@chromium.org>",
" Hayes Wang <hayeswang\@realtek.com>\0"
]
[
@@ -28,43 +23,19 @@
"b\0"
]
[
- "Initailization would reset runtime suspend by tp->saved_wolopts, so\n",
- "the tp->saved_wolopts should be set before initializing.\n",
+ "These patches are used to adjust the code.\n",
+ "\n",
+ "Hayes Wang (4):\n",
+ " r8152: enable U1/U2 for USB_SPEED_SUPER\n",
+ " r8152: check if the pointer of the function exists\n",
+ " r8152: replace netif_err with dev_err\n",
+ " r8152: spilt rtl_set_eee_plus and r8153b_green_en\n",
"\n",
- "Signed-off-by: Hayes Wang <hayeswang\@realtek.com>\n",
- "---\n",
- " drivers/net/usb/r8152.c | 9 +++++----\n",
- " 1 file changed, 5 insertions(+), 4 deletions(-)\n",
+ " drivers/net/usb/r8152.c | 67 ++++++++++++++++++++++++++++-------------\n",
+ " 1 file changed, 46 insertions(+), 21 deletions(-)\n",
"\n",
- "diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c\n",
- "index 64efd58279b3..e29e1a13e811 100644\n",
- "--- a/drivers/net/usb/r8152.c\n",
- "+++ b/drivers/net/usb/r8152.c\n",
- "\@\@ -6738,6 +6738,11 \@\@ static int rtl8152_probe(struct usb_interface *intf,\n",
- " \n",
- " \tintf->needs_remote_wakeup = 1;\n",
- " \n",
- "+\tif (!rtl_can_wakeup(tp))\n",
- "+\t\t__rtl_set_wol(tp, 0);\n",
- "+\telse\n",
- "+\t\ttp->saved_wolopts = __rtl_get_wol(tp);\n",
- "+\n",
- " \ttp->rtl_ops.init(tp);\n",
- " #if IS_BUILTIN(CONFIG_USB_RTL8152)\n",
- " \t/* Retry in case request_firmware() is not ready yet. */\n",
- "\@\@ -6755,10 +6760,6 \@\@ static int rtl8152_probe(struct usb_interface *intf,\n",
- " \t\tgoto out1;\n",
- " \t}\n",
- " \n",
- "-\tif (!rtl_can_wakeup(tp))\n",
- "-\t\t__rtl_set_wol(tp, 0);\n",
- "-\n",
- "-\ttp->saved_wolopts = __rtl_get_wol(tp);\n",
- " \tif (tp->saved_wolopts)\n",
- " \t\tdevice_set_wakeup_enable(&udev->dev, true);\n",
- " \telse\n",
"-- \n",
- "2.21.0"
+ "2.26.2"
]
-814289c188473302167970e0ef39de3512ef3d2c6c6243370e825bc87e9cd862
+27373452f646e26a7d669b1b7197c7909b280a85e16e1f60fba4e22c8d644b6d
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).