diff options
| author |   hayeswang <hayeswang@realtek.com> | 2015-01-09 10:26:35 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-01-12 16:10:22 -0500 |
| commit | aa2e092671c84b149ba0f9ad7185ace357fb4a33 (patch) | |
| tree | 7d3481b607c0dca6c0a0791e3113d967993bfc39 | |
| parent | vxlan: Improve support for header flags (diff) | |
| download | linux-dev-aa2e092671c84b149ba0f9ad7185ace357fb4a33.tar.xz linux-dev-aa2e092671c84b149ba0f9ad7185ace357fb4a33.zip | |
r8152: call rtl_start_rx after netif_carrier_on
Remove rtl_start_rx() from rtl_enable() and put it after calling
netif_carrier_on().
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/r8152.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 57ec23e8ccfa..cd9338837ce6 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -2059,7 +2059,7 @@ static int rtl_enable(struct r8152 *tp) rxdy_gated_en(tp, false); - return rtl_start_rx(tp); + return 0; } static int rtl8152_enable(struct r8152 *tp) @@ -2874,6 +2874,7 @@ static void set_carrier(struct r8152 *tp) tp->rtl_ops.enable(tp); set_bit(RTL8152_SET_RX_MODE, &tp->flags); netif_carrier_on(netdev); + rtl_start_rx(tp); } } else { if (tp->speed & LINK_STATUS) { |