--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
-@@ -658,15 +658,13 @@ enum rtl_register_content {
+@@ -657,15 +657,13 @@ enum rtl_register_content {
#define INTR_LINK 0x0004
/* rtl8152 flags */
enum rtl8152_flags {
-@@ -796,6 +794,7 @@ struct r8152 {
+@@ -795,6 +793,7 @@ struct r8152 {
bool (*in_nway)(struct r8152 *tp);
void (*hw_phy_cfg)(struct r8152 *tp);
void (*autosuspend_en)(struct r8152 *tp, bool enable);
} rtl_ops;
struct ups_info {
-@@ -1022,8 +1021,7 @@ enum tx_csum_stat {
+@@ -1021,8 +1020,7 @@ enum tx_csum_stat {
static const int multicast_filter_limit = 32;
static unsigned int agg_buf_sz = 16384;
static
int get_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
-@@ -2633,10 +2631,7 @@ static void rtl8152_nic_reset(struct r81
+@@ -2632,10 +2630,7 @@ static void rtl8152_nic_reset(struct r81
static void set_tx_qlen(struct r8152 *tp)
{
}
static inline u8 rtl8152_get_speed(struct r8152 *tp)
-@@ -4725,6 +4720,12 @@ static void r8153b_hw_phy_cfg(struct r81
+@@ -4724,6 +4719,12 @@ static void r8153b_hw_phy_cfg(struct r81
set_bit(PHY_RESET, &tp->flags);
}
static void r8153_first_init(struct r8152 *tp)
{
u32 ocp_data;
-@@ -4757,9 +4758,7 @@ static void r8153_first_init(struct r815
+@@ -4756,9 +4757,7 @@ static void r8153_first_init(struct r815
rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX);
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_TCR0);
ocp_data |= TCR0_AUTO_FIFO;
-@@ -4794,8 +4793,7 @@ static void r8153_enter_oob(struct r8152
+@@ -4793,8 +4792,7 @@ static void r8153_enter_oob(struct r8152
wait_oob_link_list_ready(tp);
switch (tp->version) {
case RTL_VER_03:
-@@ -6518,12 +6516,21 @@ static int rtl8152_change_mtu(struct net
+@@ -6495,12 +6493,21 @@ static int rtl8152_change_mtu(struct net
dev->mtu = new_mtu;
if (netif_running(dev)) {
}
mutex_unlock(&tp->control);
-@@ -6612,6 +6619,7 @@ static int rtl_ops_init(struct r8152 *tp
+@@ -6589,6 +6596,7 @@ static int rtl_ops_init(struct r8152 *tp
ops->in_nway = rtl8153_in_nway;
ops->hw_phy_cfg = r8153_hw_phy_cfg;
ops->autosuspend_en = rtl8153_runtime_enable;
if (tp->udev->speed < USB_SPEED_SUPER)
tp->rx_buf_sz = 16 * 1024;
else
-@@ -6633,6 +6641,7 @@ static int rtl_ops_init(struct r8152 *tp
+@@ -6610,6 +6618,7 @@ static int rtl_ops_init(struct r8152 *tp
ops->in_nway = rtl8153_in_nway;
ops->hw_phy_cfg = r8153b_hw_phy_cfg;
ops->autosuspend_en = rtl8153b_runtime_enable;
tp->rx_buf_sz = 32 * 1024;
tp->eee_en = true;
tp->eee_adv = MDIO_EEE_1000T | MDIO_EEE_100TX;
-@@ -6853,7 +6862,7 @@ static int rtl8152_probe(struct usb_inte
+@@ -6830,7 +6839,7 @@ static int rtl8152_probe(struct usb_inte
netdev->max_mtu = ETH_DATA_LEN;
break;
default: