Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 387a8562 authored by Ondrej Zary's avatar Ondrej Zary Committed by David S. Miller
Browse files

de2104x: fix ethtool 



When the interface is up, using ethtool breaks it because:
a) link is put down but media_timer interval is not shortened to NO_LINK
b) rxtx is stopped but not restarted

Also manual 10baseT-HD (and probably FD too - untested) mode does not work -
the link is forced up, packets are transmitted but nothing is received.
Changing CSR14 value to match documentation (not disabling link check) fixes this.

Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Acked-by: default avatarJeff Garzik <jgarzik@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 824044c1

drivers/net/tulip/de2104x.c

+5 −2
Original line number Diff line number Diff line
@@ -364,9 +364,9 @@ static u16 t21040_csr15[] = { 0, 0, 0x0006, 0x0000, 0x0000, }; 


/* 21041 transceiver register settings: TP AUTO, BNC, AUI, TP, TP FD*/

static u16 t21041_csr13[] = { 0xEF01, 0xEF09, 0xEF09, 0xEF01, 0xEF09, };

static u16 t21041_csr14[] = { 0xFFFF, 0xF7FD, 0xF7FD, 0x6F3F, 0x6F3D, };

static u16 t21041_csr14[] = { 0xFFFF, 0xF7FD, 0xF7FD, 0x7F3F, 0x7F3D, };

/* If on-chip autonegotiation is broken, use half-duplex (FF3F) instead */

static u16 t21041_csr14_brk[] = { 0xFF3F, 0xF7FD, 0xF7FD, 0x6F3F, 0x6F3D, };

static u16 t21041_csr14_brk[] = { 0xFF3F, 0xF7FD, 0xF7FD, 0x7F3F, 0x7F3D, };

static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
@@ -1596,12 +1596,15 @@ static int __de_set_settings(struct de_private *de, struct ethtool_cmd *ecmd) 
		return 0; /* nothing to change */



	de_link_down(de);

	mod_timer(&de->media_timer, jiffies + DE_TIMER_NO_LINK);

	de_stop_rxtx(de);



	de->media_type = new_media;

	de->media_lock = media_lock;

	de->media_advertise = ecmd->advertising;

	de_set_media(de);

	if (netif_running(de->dev))

		de_start_rxtx(de);



	return 0;

}