Netdev List
 help / color / mirror / Atom feed
From: Hayes Wang <hayeswang@realtek.com>
To: <netdev@vger.kernel.org>
Cc: <nic_swsd@realtek.com>, <linux-kernel@vger.kernel.org>,
	<linux-usb@vger.kernel.org>, Hayes Wang <hayeswang@realtek.com>
Subject: [PATCH net-next 07/11] r8152: move the default coalesce setting for RTL8153
Date: Fri, 9 Jun 2017 17:11:44 +0800	[thread overview]
Message-ID: <1394712342-15778-267-Taiwan-albertk@realtek.com> (raw)
In-Reply-To: <1394712342-15778-260-Taiwan-albertk@realtek.com>

Only RTL8153 could set coalesce, so move the default setting for
rtl8152_probe() to r8153_init().

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
 drivers/net/usb/r8152.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 565ac5b..f78111c 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3579,6 +3579,19 @@ static void r8153_init(struct r8152 *tp)
 	ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data);
 
 	rtl_tally_reset(tp);
+
+	switch (tp->udev->speed) {
+	case USB_SPEED_SUPER:
+	case USB_SPEED_SUPER_PLUS:
+		tp->coalesce = COALESCE_SUPER;
+		break;
+	case USB_SPEED_HIGH:
+		tp->coalesce = COALESCE_HIGH;
+		break;
+	default:
+		tp->coalesce = COALESCE_SLOW;
+		break;
+	}
 }
 
 static int rtl8152_pre_reset(struct usb_interface *intf)
@@ -4524,19 +4537,6 @@ static int rtl8152_probe(struct usb_interface *intf,
 	tp->mii.reg_num_mask = 0x1f;
 	tp->mii.phy_id = R8152_PHY_ID;
 
-	switch (udev->speed) {
-	case USB_SPEED_SUPER:
-	case USB_SPEED_SUPER_PLUS:
-		tp->coalesce = COALESCE_SUPER;
-		break;
-	case USB_SPEED_HIGH:
-		tp->coalesce = COALESCE_HIGH;
-		break;
-	default:
-		tp->coalesce = COALESCE_SLOW;
-		break;
-	}
-
 	tp->autoneg = AUTONEG_ENABLE;
 	tp->speed = tp->mii.supports_gmii ? SPEED_1000 : SPEED_100;
 	tp->duplex = DUPLEX_FULL;
-- 
2.7.4

  parent reply	other threads:[~2017-06-09  9:11 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-09  9:11 [PATCH net-next 00/11] r8152: minor adjustment Hayes Wang
2017-06-09  9:11 ` [PATCH net-next 01/11] r8152: add r8153_phy_status function Hayes Wang
2017-06-09  9:11 ` [PATCH net-next 02/11] r8152: adjust lpm settings for RTL8153 Hayes Wang
2017-06-09  9:11 ` [PATCH net-next 03/11] r8152: adjust the settings about MAC clock speed down " Hayes Wang
2017-06-09  9:11 ` [PATCH net-next 04/11] r8152: move the setting of rx aggregation Hayes Wang
2017-06-09  9:11 ` [PATCH net-next 05/11] r8152: adjust rtl8153_runtime_enable function Hayes Wang
2017-06-09  9:11 ` [PATCH net-next 06/11] r8152: adjust U2P3 for RTL8153 Hayes Wang
2017-06-09  9:11 ` Hayes Wang [this message]
2017-06-09  9:11 ` [PATCH net-next 08/11] r8152: move the initialization to reset_resume function Hayes Wang
2017-06-09  9:11 ` [PATCH net-next 09/11] r8152: check if disabling ALDPS is finished Hayes Wang
2017-06-09  9:11 ` [PATCH net-next 10/11] r8152: avoid rx queue more than 1000 packets Hayes Wang
2017-06-09  9:11 ` [PATCH net-next 11/11] r8152: replace napi_complete with napi_complete_done Hayes Wang
2017-06-09 19:38 ` [PATCH net-next 00/11] r8152: minor adjustment David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1394712342-15778-267-Taiwan-albertk@realtek.com \
    --to=hayeswang@realtek.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=nic_swsd@realtek.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox