diff for duplicates of <1394712342-15778-360-Taiwan-albertk@realtek.com>
diff --git a/a/1.txt b/N1/1.txt
index b646bb0..080c314 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,32 +1,32 @@
-When linking ON, the patch of flow control has to be reset. This
-makes sure the patch works normally.
+The RTL8156 support CDC NCM mode. And users could set the configuration
+of the USB device between vendor and NCM mode dynamically by themselves.
+That is, the driver doesn't need to set vendor mode from NCM mode.
+Fixes: 195aae321c82 ("r8152: support new chips")
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
- drivers/net/usb/r8152.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
+ drivers/net/usb/r8152.c | 9 ---------
+ 1 file changed, 9 deletions(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
-index 115559707683..504db2348a3e 100644
+index 5b4ed69df64f..47198c125719 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
-@@ -2865,6 +2865,17 @@ static int rtl8153_enable(struct r8152 *tp)
- r8153_set_rx_early_timeout(tp);
- r8153_set_rx_early_size(tp);
-
-+ if (tp->version == RTL_VER_09) {
-+ u32 ocp_data;
-+
-+ ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_TASK);
-+ ocp_data &= ~FC_PATCH_TASK;
-+ ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data);
-+ usleep_range(1000, 2000);
-+ ocp_data |= FC_PATCH_TASK;
-+ ocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data);
-+ }
-+
- return rtl_enable(tp);
- }
+@@ -9593,15 +9593,6 @@ static void rtl8152_disconnect(struct usb_interface *intf)
+ .idProduct = (prod), \
+ .bInterfaceClass = USB_CLASS_COMM, \
+ .bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \
+- .bInterfaceProtocol = USB_CDC_PROTO_NONE \
+-}, \
+-{ \
+- .match_flags = USB_DEVICE_ID_MATCH_INT_INFO | \
+- USB_DEVICE_ID_MATCH_DEVICE, \
+- .idVendor = (vend), \
+- .idProduct = (prod), \
+- .bInterfaceClass = USB_CLASS_COMM, \
+- .bInterfaceSubClass = USB_CDC_SUBCLASS_NCM, \
+ .bInterfaceProtocol = USB_CDC_PROTO_NONE
+ /* table of devices that work with this driver */
--
-2.21.0
\ No newline at end of file
+2.26.3
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index a1a1eee..c47cfb9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,27 +1,24 @@
[
- "ref\0001394712342-15778-338-Taiwan-albertk\@realtek.com\0"
-]
-[
- "ref\0001394712342-15778-358-Taiwan-albertk\@realtek.com\0"
+ "ref\0001394712342-15778-359-Taiwan-albertk\@realtek.com\0"
]
[
"From\0Hayes Wang <hayeswang\@realtek.com>\0"
]
[
- "Subject\0[PATCH net v3 2/9] r8152: reset flow control patch when linking on for RTL8153B\0"
+ "Subject\0[PATCH net-next 1/2] r8152: remove NCM mode from REALTEK_USB_DEVICE macro\0"
]
[
- "Date\0Wed, 22 Jan 2020 16:02:06 +0800\0"
+ "Date\0Fri, 23 Apr 2021 17:44:54 +0800\0"
]
[
- "To\0<netdev\@vger.kernel.org>\0"
+ "To\0<kuba\@kernel.org>",
+ " <davem\@davemloft.net>\0"
]
[
- "Cc\0<nic_swsd\@realtek.com>",
+ "Cc\0<netdev\@vger.kernel.org>",
+ " <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"
]
[
@@ -31,38 +28,38 @@
"b\0"
]
[
- "When linking ON, the patch of flow control has to be reset. This\n",
- "makes sure the patch works normally.\n",
+ "The RTL8156 support CDC NCM mode. And users could set the configuration\n",
+ "of the USB device between vendor and NCM mode dynamically by themselves.\n",
+ "That is, the driver doesn't need to set vendor mode from NCM mode.\n",
"\n",
+ "Fixes: 195aae321c82 (\"r8152: support new chips\")\n",
"Signed-off-by: Hayes Wang <hayeswang\@realtek.com>\n",
"---\n",
- " drivers/net/usb/r8152.c | 11 +++++++++++\n",
- " 1 file changed, 11 insertions(+)\n",
+ " drivers/net/usb/r8152.c | 9 ---------\n",
+ " 1 file changed, 9 deletions(-)\n",
"\n",
"diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c\n",
- "index 115559707683..504db2348a3e 100644\n",
+ "index 5b4ed69df64f..47198c125719 100644\n",
"--- a/drivers/net/usb/r8152.c\n",
"+++ b/drivers/net/usb/r8152.c\n",
- "\@\@ -2865,6 +2865,17 \@\@ static int rtl8153_enable(struct r8152 *tp)\n",
- " \tr8153_set_rx_early_timeout(tp);\n",
- " \tr8153_set_rx_early_size(tp);\n",
- " \n",
- "+\tif (tp->version == RTL_VER_09) {\n",
- "+\t\tu32 ocp_data;\n",
- "+\n",
- "+\t\tocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_FW_TASK);\n",
- "+\t\tocp_data &= ~FC_PATCH_TASK;\n",
- "+\t\tocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data);\n",
- "+\t\tusleep_range(1000, 2000);\n",
- "+\t\tocp_data |= FC_PATCH_TASK;\n",
- "+\t\tocp_write_word(tp, MCU_TYPE_USB, USB_FW_TASK, ocp_data);\n",
- "+\t}\n",
- "+\n",
- " \treturn rtl_enable(tp);\n",
- " }\n",
+ "\@\@ -9593,15 +9593,6 \@\@ static void rtl8152_disconnect(struct usb_interface *intf)\n",
+ " \t.idProduct = (prod), \\\n",
+ " \t.bInterfaceClass = USB_CLASS_COMM, \\\n",
+ " \t.bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \\\n",
+ "-\t.bInterfaceProtocol = USB_CDC_PROTO_NONE \\\n",
+ "-}, \\\n",
+ "-{ \\\n",
+ "-\t.match_flags = USB_DEVICE_ID_MATCH_INT_INFO | \\\n",
+ "-\t\t USB_DEVICE_ID_MATCH_DEVICE, \\\n",
+ "-\t.idVendor = (vend), \\\n",
+ "-\t.idProduct = (prod), \\\n",
+ "-\t.bInterfaceClass = USB_CLASS_COMM, \\\n",
+ "-\t.bInterfaceSubClass = USB_CDC_SUBCLASS_NCM, \\\n",
+ " \t.bInterfaceProtocol = USB_CDC_PROTO_NONE\n",
" \n",
+ " /* table of devices that work with this driver */\n",
"-- \n",
- "2.21.0"
+ "2.26.3"
]
-6fbf6a1d6f8448b6cafa71efd477ca96895b5e6a831e16644533876a66d7fca7
+738d6a16ce15bc8b8cdbe3f79be2d7cb0c8ad02eab24a4992b5bc33c737ecd63
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).