Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1567067
| From | Hayes Wang <hayeswang@realtek.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH net v3 2/4] r8152: avoid start_xmit to schedule napi when napi is disabled |
| Date | 2017-01-26 02:40 +0100 |
| Message-ID | <t3HcB-130-1@gated-at.bofh.it> (permalink) |
| References | <t3lYu-4hv-9@gated-at.bofh.it> <t3HcB-130-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Stop the tx when the napi is disabled to prevent napi_schedule() is
called.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
drivers/net/usb/r8152.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 23bef8e..ec882be 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3155,10 +3155,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)) {
@@ -3166,6 +3169,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");
}
}
}
@@ -3515,12 +3519,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);
@@ -3548,10 +3552,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);
return 0;
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH net 0/4] r8152: fix scheduling napi Hayes Wang <hayeswang@realtek.com> - 2017-01-25 04:00 +0100
[PATCH net 1/4] r8152: avoid start_xmit to call napi_schedule during autosuspend Hayes Wang <hayeswang@realtek.com> - 2017-01-25 04:00 +0100
Re: [PATCH net 1/4] r8152: avoid start_xmit to call napi_schedule during autosuspend Stephen Hemminger <stephen@networkplumber.org> - 2017-01-25 06:10 +0100
[PATCH net 4/4] r8152: check rx after napi is enabled Hayes Wang <hayeswang@realtek.com> - 2017-01-25 04:00 +0100
[PATCH net 3/4] r8152: re-schedule napi for tx Hayes Wang <hayeswang@realtek.com> - 2017-01-25 04:00 +0100
[PATCH net 2/4] r8152: avoid start_xmit to schedule napi when napi is disabled Hayes Wang <hayeswang@realtek.com> - 2017-01-25 04:00 +0100
[PATCH net v2 0/4] r8152: fix scheduling napi Hayes Wang <hayeswang@realtek.com> - 2017-01-25 09:20 +0100
[PATCH net v2 4/4] r8152: check rx after napi is enabled Hayes Wang <hayeswang@realtek.com> - 2017-01-25 09:20 +0100
[PATCH net v2 3/4] r8152: re-schedule napi for tx Hayes Wang <hayeswang@realtek.com> - 2017-01-25 09:20 +0100
Re: [PATCH net v2 3/4] r8152: re-schedule napi for tx Eric Dumazet <eric.dumazet@gmail.com> - 2017-01-25 15:00 +0100
RE: [PATCH net v2 3/4] r8152: re-schedule napi for tx Hayes Wang <hayeswang@realtek.com> - 2017-01-26 02:30 +0100
[PATCH net v2 2/4] r8152: avoid start_xmit to schedule napi when napi is disabled Hayes Wang <hayeswang@realtek.com> - 2017-01-25 09:20 +0100
[PATCH net v2 1/4] r8152: avoid start_xmit to call napi_schedule during autosuspend Hayes Wang <hayeswang@realtek.com> - 2017-01-25 09:20 +0100
Re: [PATCH net v2 0/4] r8152: fix scheduling napi David Miller <davem@davemloft.net> - 2017-01-25 20:40 +0100
RE: [PATCH net v2 0/4] r8152: fix scheduling napi Hayes Wang <hayeswang@realtek.com> - 2017-01-26 04:10 +0100
Re: [PATCH net v2 0/4] r8152: fix scheduling napi David Miller <davem@davemloft.net> - 2017-01-26 04:50 +0100
[PATCH net v3 2/4] r8152: avoid start_xmit to schedule napi when napi is disabled Hayes Wang <hayeswang@realtek.com> - 2017-01-26 02:40 +0100
[PATCH net v3 3/4] r8152: re-schedule napi for tx Hayes Wang <hayeswang@realtek.com> - 2017-01-26 02:40 +0100
[PATCH net v3 1/4] r8152: avoid start_xmit to call napi_schedule during autosuspend Hayes Wang <hayeswang@realtek.com> - 2017-01-26 02:40 +0100
[PATCH net v3 4/4] r8152: check rx after napi is enabled Hayes Wang <hayeswang@realtek.com> - 2017-01-26 02:40 +0100
[PATCH net v3 0/4] r8152: fix scheduling napi Hayes Wang <hayeswang@realtek.com> - 2017-01-26 02:50 +0100
Re: [PATCH net v3 0/4] r8152: fix scheduling napi David Miller <davem@davemloft.net> - 2017-01-26 04:50 +0100
RE: [PATCH net v3 0/4] r8152: fix scheduling napi Hayes Wang <hayeswang@realtek.com> - 2017-01-26 05:00 +0100
csiph-web