From nobody Fri Jul 01 06:15:29 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2C0758AA515; Fri, 1 Jul 2022 06:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LZ4gk0Nt0z4npq; Fri, 1 Jul 2022 06:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656656130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P5g7Kv41bApBdR4NxOrz6rDJLPO6r8UwxNsq8cJHLHE=; b=rusC3jPHkheqKeTDdwZpSKQ52R3v7eZORKfNk1qVkbnen8ZJ597OJ8t5sTauAdp3G4ZIdC KXkXmNwv5A7GhpINRoMS5EqUV6iklKmI6w8PH3qfeRzPH49/IK7b0yjgz3iFmER3i16Cg0 rmyYW1sCGXA+H3tFpGd9esmYdmEiytD2nTphs9iWV/mGXEUnBD5GmmsBIbG8zgfZcn/zo0 qnzFjSVSRLCl9KMac0mJhUXy+z1U8+vplzRnnWhJ+PHD9GvTSr/vIB6mY9gdHmaWscDkOf 05y4qzlc25rR7Phz/vLqdC3K0OL86K1GAJyqTTBlnr71MxW+LWPH5qQlG+ay1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E0B1016105; Fri, 1 Jul 2022 06:15:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2616FTxQ052040; Fri, 1 Jul 2022 06:15:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2616FTpm052039; Fri, 1 Jul 2022 06:15:29 GMT (envelope-from git) Date: Fri, 1 Jul 2022 06:15:29 GMT Message-Id: <202207010615.2616FTpm052039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Kornel=20Dul=C4=99ba?= Subject: git: 3b8d04f845b4 - main - igc: Change default duplex setting List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b8d04f845b416d29a258658b8a48d1afb4a2e81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656656130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P5g7Kv41bApBdR4NxOrz6rDJLPO6r8UwxNsq8cJHLHE=; b=mWLuITdJQuUr0Tq97cWMpyIaDnILpBbBUNUCvszyifGOKKcU+7fGUkQy7BUh6X8G68URC3 N0vvEJR0vWf92/n4tZg+AYlY08JiJbTTNEt/w6SPTphJhkEkpDy/mg00xYMgl3hq/h4KmF 1LWFTeCQYm2oHf0GhnnuGkq0N7qAa2J+ZExYLP0mPKdcQL3CzEBreV7mdAfNg1jG6W+LXP 04T7dIvvl1CI9i6ZYnuNDeCyQ66K0j3BkreG79bGTvR/HtezXiW30YfKrDEjasNkt+tEDo w0JdAuGiHeefZcELJ3SjR5SiN2R+rwr5ZdesiJ3fRYaoXK9YPzYPhmA7CroHmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656656130; a=rsa-sha256; cv=none; b=MisdNl3cxRxrl7Pto6lsczBGRviGkWPyPsqkVhesBHDxI5jdUuJV+UIcomHCSUXaf8+bpP WxF8LJyh7zhNiF25FFmT6fUqX81n6KaspzNdM3f5e6Z5XfxwgzsGT7GzJte9JlsfngpGM3 Nxn4xH/5A6P5w+euvG0Z776l2eXfi/hQjOhcqoDWHDZRT8Rihw25oKYEgdl3zaSZ84qpoT lI9kB/pA++rhDwXEi8Fch9oT1/+Mha+2cF6bvgQFTBqTe8lLVqXoa04BcjpXuRF+E3Q0eh ggH1HwARIKbOauNA/177Nr00AnEG4b7YLp7rYu9PPY+icNJGC1DbHKiHloEEGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kd: URL: https://cgit.FreeBSD.org/src/commit/?id=3b8d04f845b416d29a258658b8a48d1afb4a2e81 commit 3b8d04f845b416d29a258658b8a48d1afb4a2e81 Author: Kornel Dulęba AuthorDate: 2022-06-30 11:57:58 +0000 Commit: Kornel Dulęba CommitDate: 2022-07-01 06:12:08 +0000 igc: Change default duplex setting During media selection through ifconfig one might not specify the duplex setting through the mediaopt flag. In that case the igc driver would default to full-duplex. The problem with this approach is that e1000(em/igb) driver defaults to half-duplex. Because of that if one connects both NICs and sets media to e.g. 100baseTX on both of them no link will be found. Fix that by matching igc behaviour with what e1000 does. Reviewed by: grehan Approved by: mw(mentor) Obtained from: Semihalf Sponsored by: Stormshield MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D35673 --- sys/dev/igc/if_igc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 2430101283a2..b3de0f123c5c 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -1070,16 +1070,16 @@ igc_if_media_change(if_ctx_t ctx) adapter->hw.phy.autoneg_advertised = ADVERTISE_1000_FULL; break; case IFM_100_TX: - if ((ifm->ifm_media & IFM_GMASK) == IFM_HDX) - adapter->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; - else + if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) adapter->hw.phy.autoneg_advertised = ADVERTISE_100_FULL; + else + adapter->hw.phy.autoneg_advertised = ADVERTISE_100_HALF; break; case IFM_10_T: - if ((ifm->ifm_media & IFM_GMASK) == IFM_HDX) - adapter->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; - else + if ((ifm->ifm_media & IFM_GMASK) == IFM_FDX) adapter->hw.phy.autoneg_advertised = ADVERTISE_10_FULL; + else + adapter->hw.phy.autoneg_advertised = ADVERTISE_10_HALF; break; default: device_printf(adapter->dev, "Unsupported media type\n");