Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9ace99c authored by hayeswang's avatar hayeswang Committed by Greg Kroah-Hartman
Browse files

r8152: avoid start_xmit to schedule napi when napi is disabled 




[ Upstream commit de9bf29dd6e4a8a874cb92f8901aed50a9d0b1d3 ]

Stop the tx when the napi is disabled to prevent napi_schedule() is
called.

Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c1a7106b

drivers/net/usb/r8152.c

+6 −2
Original line number Diff line number Diff line
@@ -3158,10 +3158,13 @@ static void set_carrier(struct r8152 *tp) 
		if (!netif_carrier_ok(netdev)) {

			tp->rtl_ops.enable(tp);

			set_bit(RTL8152_SET_RX_MODE, &tp->flags);

			netif_stop_queue(netdev);

			napi_disable(&tp->napi);

			netif_carrier_on(netdev);

			rtl_start_rx(tp);

			napi_enable(&tp->napi);

			netif_wake_queue(netdev);

			netif_info(tp, link, netdev, "carrier on\n");

		}

	} else {

		if (netif_carrier_ok(netdev)) {
@@ -3169,6 +3172,7 @@ static void set_carrier(struct r8152 *tp) 
			napi_disable(&tp->napi);

			tp->rtl_ops.disable(tp);

			napi_enable(&tp->napi);

			netif_info(tp, link, netdev, "carrier off\n");

		}

	}

}
@@ -3518,12 +3522,12 @@ static int rtl8152_pre_reset(struct usb_interface *intf) 
	if (!netif_running(netdev))

		return 0;



	netif_stop_queue(netdev);

	napi_disable(&tp->napi);

	clear_bit(WORK_ENABLE, &tp->flags);

	usb_kill_urb(tp->intr_urb);

	cancel_delayed_work_sync(&tp->schedule);

	if (netif_carrier_ok(netdev)) {

		netif_stop_queue(netdev);

		mutex_lock(&tp->control);

		tp->rtl_ops.disable(tp);

		mutex_unlock(&tp->control);
@@ -3551,10 +3555,10 @@ static int rtl8152_post_reset(struct usb_interface *intf) 
		rtl_start_rx(tp);

		rtl8152_set_rx_mode(netdev);

		mutex_unlock(&tp->control);

		netif_wake_queue(netdev);

	}



	napi_enable(&tp->napi);

	netif_wake_queue(netdev);

	usb_submit_urb(tp->intr_urb, GFP_KERNEL);



	if (!list_empty(&tp->rx_done))