From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Paul Rolland" Subject: Re: [2.4.32 - 2.6.15.4] e1000 - Fix mii interface Date: Sun, 26 Feb 2006 16:12:48 +0100 Message-ID: <01e101c63ae7$1b417990$2001a8c0@cortex> References: <9a8748490602260700s2e82a623mcf2d778aa109bb00@mail.gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_01E2_01C63AEF.7D05E190" Cc: , , , , , Return-path: To: "'Jesper Juhl'" In-Reply-To: <9a8748490602260700s2e82a623mcf2d778aa109bb00@mail.gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org This is a multi-part message in MIME format. ------=_NextPart_000_01E2_01C63AEF.7D05E190 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Hello, > Ok, great, I was just wondering since I would have made one if you had > no plans to do so. Well, I was just waiting to make sure it was interesting for someone ;) Here is it, verified with tab and not spaces... but attached as my mailer is likely to cripple anything I try to inline... Signed-off-by: Paul Rolland Cheers, Paul ------=_NextPart_000_01E2_01C63AEF.7D05E190 Content-Type: application/octet-stream; name="e1000.patch-2.6.15.4" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="e1000.patch-2.6.15.4" diff -urN linux-2.6.15.4.orig/drivers/net/e1000/e1000_main.c = linux-2.6.15.4/drivers/net/e1000/e1000_main.c=0A= --- linux-2.6.15.4.orig/drivers/net/e1000/e1000_main.c Fri Feb 10 = 07:22:48 2006=0A= +++ linux-2.6.15.4/drivers/net/e1000/e1000_main.c Sun Feb 26 15:04:40 = 2006=0A= @@ -4153,29 +4153,29 @@=0A= =0A= /* Fiber NICs only allow 1000 gbps Full duplex */=0A= if((adapter->hw.media_type =3D=3D e1000_media_type_fiber) &&=0A= - spddplx !=3D (SPEED_1000 + DUPLEX_FULL)) {=0A= + spddplx !=3D (SPEED_1000 + FULL_DUPLEX)) {=0A= DPRINTK(PROBE, ERR, "Unsupported Speed/Duplex configuration\n");=0A= return -EINVAL;=0A= }=0A= =0A= switch(spddplx) {=0A= - case SPEED_10 + DUPLEX_HALF:=0A= + case SPEED_10 + HALF_DUPLEX:=0A= adapter->hw.forced_speed_duplex =3D e1000_10_half;=0A= break;=0A= - case SPEED_10 + DUPLEX_FULL:=0A= + case SPEED_10 + FULL_DUPLEX:=0A= adapter->hw.forced_speed_duplex =3D e1000_10_full;=0A= break;=0A= - case SPEED_100 + DUPLEX_HALF:=0A= + case SPEED_100 + HALF_DUPLEX:=0A= adapter->hw.forced_speed_duplex =3D e1000_100_half;=0A= break;=0A= - case SPEED_100 + DUPLEX_FULL:=0A= + case SPEED_100 + FULL_DUPLEX:=0A= adapter->hw.forced_speed_duplex =3D e1000_100_full;=0A= break;=0A= - case SPEED_1000 + DUPLEX_FULL:=0A= + case SPEED_1000 + FULL_DUPLEX:=0A= adapter->hw.autoneg =3D 1;=0A= adapter->hw.autoneg_advertised =3D ADVERTISE_1000_FULL;=0A= break;=0A= - case SPEED_1000 + DUPLEX_HALF: /* not supported */=0A= + case SPEED_1000 + HALF_DUPLEX: /* not supported */=0A= default:=0A= DPRINTK(PROBE, ERR, "Unsupported Speed/Duplex configuration\n");=0A= return -EINVAL;=0A= ------=_NextPart_000_01E2_01C63AEF.7D05E190--