projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dadaa10
)
r8169: fix a bug in rtl8169_init_phy()
author
Eric Dumazet
<
[email protected]
>
Sat, 19 Mar 2011 05:39:11 +0000
(
05:39
+0000)
committer
David S. Miller
<
[email protected]
>
Sat, 19 Mar 2011 20:39:33 +0000
(13:39 -0700)
commit
54405cde7624
(r8169: support control of advertising.)
introduced a bug in rtl8169_init_phy()
Reported-by: Piotr Hosowicz <
[email protected]
>
Signed-off-by: Eric Dumazet <
[email protected]
>
Cc: Oliver Neukum <
[email protected]
>
Cc: Francois Romieu <
[email protected]
>
Tested-by: Anca Emanuel <
[email protected]
>
Tested-by: Piotr Hosowicz <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/r8169.c
patch
|
blob
|
history
diff --git
a/drivers/net/r8169.c
b/drivers/net/r8169.c
index 5e403511289de11b17f189c9649cdeb66cfdc1ee..493b0de3848bf17fadd6741ad57d5b4701b2f074 100644
(file)
--- a/
drivers/net/r8169.c
+++ b/
drivers/net/r8169.c
@@
-2685,9
+2685,9
@@
static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
rtl8169_set_speed(dev, AUTONEG_ENABLE, SPEED_1000, DUPLEX_FULL,
ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
- tp->mii.supports_gmii ?
+
(
tp->mii.supports_gmii ?
ADVERTISED_1000baseT_Half |
- ADVERTISED_1000baseT_Full : 0);
+ ADVERTISED_1000baseT_Full : 0)
)
;
if (RTL_R8(PHYstatus) & TBI_Enable)
netif_info(tp, link, dev, "TBI auto-negotiating\n");