diff options
| author | hayeswang <hayeswang@realtek.com> | 2017-06-09 11:11:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-09 21:37:01 +0200 |
| commit | 49d10347d445f003cdd3a3c2c4f36d11aa67e6e1 (patch) | |
| tree | 5ce9f70c6c4f352d39aca78453682c0c2824c28a /drivers/net/usb | |
| parent | r8152: adjust U2P3 for RTL8153 (diff) | |
| download | linux-49d10347d445f003cdd3a3c2c4f36d11aa67e6e1.tar.xz linux-49d10347d445f003cdd3a3c2c4f36d11aa67e6e1.zip | |
r8152: move the default coalesce setting for RTL8153
Only RTL8153 could set coalesce, so move the default setting for
rtl8152_probe() to r8153_init().
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
| -rw-r--r-- | drivers/net/usb/r8152.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 565ac5b8b9ca..f78111c1ae40 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; |