Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1662163

[PATCH net-next 07/11] r8152: move the default coalesce setting for RTL8153

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH net-next 00/11] r8152: minor adjustment Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 05/11] r8152: adjust rtl8153_runtime_enable function Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 11/11] r8152: replace napi_complete with napi_complete_done Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 03/11] r8152: adjust the settings about MAC clock speed down for RTL8153 Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 10/11] r8152: avoid rx queue more than 1000 packets Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 04/11] r8152: move the setting of rx aggregation Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 02/11] r8152: adjust lpm settings for RTL8153 Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 07/11] r8152: move the default coalesce setting for RTL8153 Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  [PATCH net-next 01/11] r8152: add r8153_phy_status function Hayes Wang <hayeswang@realtek.com> - 2017-06-09 11:20 +0200
  Re: [PATCH net-next 00/11] r8152: minor adjustment David Miller <davem@davemloft.net> - 2017-06-09 21:40 +0200

csiph-web