OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3bf3947
)
r8152: call rtl_start_rx after netif_carrier_on
author
hayeswang
<hayeswang@realtek.com>
Fri, 9 Jan 2015 02:26:35 +0000
(10:26 +0800)
committer
David S. Miller
<davem@davemloft.net>
Mon, 12 Jan 2015 21:10:22 +0000
(16:10 -0500)
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>
drivers/net/usb/r8152.c
patch
|
blob
|
history
diff --git
a/drivers/net/usb/r8152.c
b/drivers/net/usb/r8152.c
index
57ec23e
..
cd93388
100644
(file)
--- 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) {