linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

diff for duplicates of <1394712342-15778-348-Taiwan-albertk@realtek.com>

diff --git a/a/1.txt b/N1/1.txt
index 331833e..7f70eed 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,22 +1,23 @@
-v2:
-For patch #2, move declaring the variable "ocp_data".
+The (0xBAF70000 & 0x00FFF000) << 6 should be (0xf70 << 18).
 
-v1:
-These patches are used to fix some issues for RTL8153.
-
-Hayes Wang (9):
-  r8152: fix runtime resume for linking change
-  r8152: reset flow control patch when linking on for RTL8153B
-  r8152: get default setting of WOL before initializing
-  r8152: disable U2P3 for RTL8153B
-  r8152: Disable PLA MCU clock speed down
-  r8152: disable test IO for RTL8153B
-  r8152: don't enable U1U2 with USB_SPEED_HIGH for RTL8153B
-  r8152: avoid the MCU to clear the lanwake
-  r8152: disable DelayPhyPwrChg
-
- drivers/net/usb/r8152.c | 124 ++++++++++++++++++++++++++++++++++++----
- 1 file changed, 113 insertions(+), 11 deletions(-)
+Fixes: 561535b0f239 ("r8169: fix OCP access on RTL8117")
+Signed-off-by: Hayes Wang <hayeswang@realtek.com>
+---
+ drivers/net/ethernet/realtek/r8169_main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
+index f704da3f214c..7aad0ba53372 100644
+--- a/drivers/net/ethernet/realtek/r8169_main.c
++++ b/drivers/net/ethernet/realtek/r8169_main.c
+@@ -767,7 +767,7 @@ static void r8168fp_adjust_ocp_cmd(struct rtl8169_private *tp, u32 *cmd, int typ
+ 	if (type == ERIAR_OOB &&
+ 	    (tp->mac_version == RTL_GIGA_MAC_VER_52 ||
+ 	     tp->mac_version == RTL_GIGA_MAC_VER_53))
+-		*cmd |= 0x7f0 << 18;
++		*cmd |= 0xf70 << 18;
+ }
+ 
+ DECLARE_RTL_COND(rtl_eriar_cond)
 -- 
-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 b4d53a0..af7e5d4 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 v2 0/9] r8152: serial fixes\0"
+  "Subject\0[PATCH net] r8169: fix r8168fp_adjust_ocp_cmd function\0"
 ]
 [
-  "Date\0Wed, 22 Jan 2020 09:41:12 +0800\0"
+  "Date\0Fri, 5 Mar 2021 17:34:41 +0800\0"
 ]
 [
   "To\0<netdev\@vger.kernel.org>\0"
@@ -16,9 +13,7 @@
 [
   "Cc\0<nic_swsd\@realtek.com>",
   " <linux-kernel\@vger.kernel.org>",
-  " <linux-usb\@vger.kernel.org>",
-  " <pmalani\@chromium.org>",
-  " <grundler\@chromium.org>",
+  " <hkallweit1\@gmail.com>",
   " Hayes Wang <hayeswang\@realtek.com>\0"
 ]
 [
@@ -28,28 +23,29 @@
   "b\0"
 ]
 [
-  "v2:\n",
-  "For patch #2, move declaring the variable \"ocp_data\".\n",
-  "\n",
-  "v1:\n",
-  "These patches are used to fix some issues for RTL8153.\n",
-  "\n",
-  "Hayes Wang (9):\n",
-  "  r8152: fix runtime resume for linking change\n",
-  "  r8152: reset flow control patch when linking on for RTL8153B\n",
-  "  r8152: get default setting of WOL before initializing\n",
-  "  r8152: disable U2P3 for RTL8153B\n",
-  "  r8152: Disable PLA MCU clock speed down\n",
-  "  r8152: disable test IO for RTL8153B\n",
-  "  r8152: don't enable U1U2 with USB_SPEED_HIGH for RTL8153B\n",
-  "  r8152: avoid the MCU to clear the lanwake\n",
-  "  r8152: disable DelayPhyPwrChg\n",
+  "The (0xBAF70000 & 0x00FFF000) << 6 should be (0xf70 << 18).\n",
   "\n",
-  " drivers/net/usb/r8152.c | 124 ++++++++++++++++++++++++++++++++++++----\n",
-  " 1 file changed, 113 insertions(+), 11 deletions(-)\n",
+  "Fixes: 561535b0f239 (\"r8169: fix OCP access on RTL8117\")\n",
+  "Signed-off-by: Hayes Wang <hayeswang\@realtek.com>\n",
+  "---\n",
+  " drivers/net/ethernet/realtek/r8169_main.c | 2 +-\n",
+  " 1 file changed, 1 insertion(+), 1 deletion(-)\n",
   "\n",
+  "diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c\n",
+  "index f704da3f214c..7aad0ba53372 100644\n",
+  "--- a/drivers/net/ethernet/realtek/r8169_main.c\n",
+  "+++ b/drivers/net/ethernet/realtek/r8169_main.c\n",
+  "\@\@ -767,7 +767,7 \@\@ static void r8168fp_adjust_ocp_cmd(struct rtl8169_private *tp, u32 *cmd, int typ\n",
+  " \tif (type == ERIAR_OOB &&\n",
+  " \t    (tp->mac_version == RTL_GIGA_MAC_VER_52 ||\n",
+  " \t     tp->mac_version == RTL_GIGA_MAC_VER_53))\n",
+  "-\t\t*cmd |= 0x7f0 << 18;\n",
+  "+\t\t*cmd |= 0xf70 << 18;\n",
+  " }\n",
+  " \n",
+  " DECLARE_RTL_COND(rtl_eriar_cond)\n",
   "-- \n",
-  "2.21.0"
+  "2.26.2"
 ]
 
-0dc88bd437c98cb5fcbf879b8742fb35c30d899c4d2d979f4a6836b36ce061ba
+3519807d51e2aba5ad19159757c454a533847c9f52f91b583c7c561b25719dd9
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).