From nobody Tue Jul 19 09:57:49 2022 X-Original-To: dev-commits-src-branches@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 4LnDlx4sybz4WvHr; Tue, 19 Jul 2022 09:57:49 +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 4LnDlx4Nkxz45GY; Tue, 19 Jul 2022 09:57:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658224669; 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=r2l4TJ4/UnfudHODufqfy4J8EJQ/ioezs7Pajlw1sEw=; b=DjMn7UUhPTDy6nImfkX+4PbPN/NoNi2gLoNo1IowNj73Urm+XBModKdE+k9wuyY+9rCgO3 3sX864EwdThb68Vv68jKn7h7RhexGkQSH8swneCiUW8WsT+ijEs0VlvLGFG38t5MnnhlGt yLcG0AYkJ8K8zuQ9eYx9eSPpVmU+iWsJvdMI7SkhxSe4ahpgAcmez74nrJ+VH4EfCkRkAl aK7eFDeQg0gGRZ20++TgY5NSmIn6Axx2pIDFp1sWMxGVwGyggF/vT60xR0A22WSYRWcBDX sqcGtUOyQJteStFhhaKRC0npM589cmTiRhwZDKwLrgyFI/rEu9qNwS9f0XM6Ag== 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 4LnDlx3KTRzDy2; Tue, 19 Jul 2022 09:57:49 +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 26J9vncK012885; Tue, 19 Jul 2022 09:57:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26J9vnQw012884; Tue, 19 Jul 2022 09:57:49 GMT (envelope-from git) Date: Tue, 19 Jul 2022 09:57:49 GMT Message-Id: <202207190957.26J9vnQw012884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Kornel=20Dul=C4=99ba?= Subject: git: 94c272b4c6cc - stable/13 - igc: Change default duplex setting List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 94c272b4c6ccf74739dac5b7d93543daf65a1793 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658224669; 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=r2l4TJ4/UnfudHODufqfy4J8EJQ/ioezs7Pajlw1sEw=; b=vxXIEBHK4TajmR+Z66omc4IMrPtLk8RxMiYEkK/xhcEjp38425V4547XgFZHn05wpAN1Bs j41Shrt5f/52B6B34PUJq98cEfJFsLTNPCj+5ZEMBL0U0FyrHi6mQnXO14DEhh5+q9latq UBypIaJG/njxWBRWtiKhyRpMJpSFP9qyaugGS9i9mvCjSU4sfBstxS4cqeXRw3mW0TAKaP wrlsDxnqrBTetctFaTnyA7ucXyWjdmkPPZWPVaBMm7FECdP4iWZzW7PEJIooE/qpkxYpU+ ZB5T4jFOCzZpVUaNv2fTtTef51aZGW9HB0A2Y6yf/sUo17Whav+JGkRDuL2zYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658224669; a=rsa-sha256; cv=none; b=ecBQwyY4YOWbfJNeSD7ZS8eEETaTkvD05+goV7qmBe1TdkKUS+Xuv7ZeRjRZ1tWnQJlTED LkiQFHfdl5gsLN2v23zKAnAnyI+Zvo81krUzxBmatzOXyeuclPrRJaDGBAobCZPaoyZpVX JT/8VC7B7TC7YMn7i185GMza1e26glqkwut7HDvshVa3aKRTmb0Fn/vps1dfbuPv+1t/Nd +kijqQ2zORRPG4E5tPIwWu5qdSnOniYyoFVmh7ushqlImp3RNx757lCcxzSyh4is9Be2vg O/EET1GSE4gEh42gHYpDmRCfty+MqQHygAmqopgS9pNkvBXl0uOTT975I7IUwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kd: URL: https://cgit.FreeBSD.org/src/commit/?id=94c272b4c6ccf74739dac5b7d93543daf65a1793 commit 94c272b4c6ccf74739dac5b7d93543daf65a1793 Author: Kornel Dulęba AuthorDate: 2022-06-30 11:57:58 +0000 Commit: Kornel Dulęba CommitDate: 2022-07-19 09:36:48 +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 (cherry picked from commit 3b8d04f845b416d29a258658b8a48d1afb4a2e81) --- 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 20dbd3f71d39..607b893c9ab8 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -1071,16 +1071,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");