Messages in this thread | | | Date | Sat, 19 Mar 2011 13:38:38 -0700 (PDT) | Subject | Re: [PATCH] r8169: fix a bug in rtl8169_init_phy() | From | David Miller <> |
| |
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Sat, 19 Mar 2011 16:39:11 +0100
> [PATCH] r8169: fix a bug in rtl8169_init_phy() > > commit 54405cde7624 (r8169: support control of advertising.) > introduced a bug in rtl8169_init_phy() > > Reported-by: Piotr Hosowicz <piotr@hosowicz.com> > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Applied to net-2.6, thanks Eric.
Linus, this is definitely the bug you were seeing too.
> Cc: Oliver Neukum <oliver@neukum.org> > Cc: Francois Romieu <romieu@fr.zoreil.com> > --- > drivers/net/r8169.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c > index 5e40351..493b0de 100644 > --- 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"); > >
| |