From nobody Sat Oct 31 20:24:32 2026 X-Original-To: dev-commits-src-all@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 4jH8Zm6TNwz6xF8m for ; Sat, 31 Oct 2026 20:24:32 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jH8Zm5DVsz4Nq1 for ; Sat, 31 Oct 2026 20:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793478272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=niFvV1pa01S6xvezF6S93P1uN7PZ3REwxXIaOfUeDHk=; b=luuAHXMZd7Y7FpR4iM/t51Kpuq5Vw+5reDaKrlMVcNJ4wIaaz1TtBdpJAB9HQsjnmYHR/q 9+q5AM5CU+bBIU5ZFQtHUWxyvsAo/gMXEIWy2DXRj8v1REc1QMauwf115HfSbam20cERs9 F6YFyoouGzIFZcBZm7GmvpuVEXqX7ViGsgXqO4GpRAuBeziLYS47eR2xx/ddgO+xLkrx4h phIz85Atv8i2Zn8s4jSgrv+1PEESbuGFlC6i0HrKPh2VgIZo0hrkMm9650gQnfr6mJq7IY NhDGt018nhDmpfOZjbgVPSiedS/Qj3YC+LQJMstxl53zMcjapt/icIIBgjvlYg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793478272; b=Fh+L4vxCYKaCc/y97SCXQ+WBLcsq86W6aZ8+Y+UIczzdYwuQuXOXwSe1gvHhJehRfgKbr2 p5rs0R5SwfTQuuYpZdIoOfLZoRqkbzf27VFyg6t9SyOpAnvGTfqlXMmC3yIeB6Owxc8OPM syqqXuLOFP0w+GhhHi3VcNEBGQW1SBOcLsjGgZ4W/LW08IsA4g9e6GXV5CpoqfaSIkTHzb phQE6Lqd2POezalxB4KT+ReaH48MlBidFVUVF1a3Pezy4pao3zbhD0qzhZ0STJMfP4lw+Z egXiZN/0dpqc3kcyUuPtvuZYCwW6LV2mVPPLxJPuK4YSjKaviUKxIsMYNXx1UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793478272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=niFvV1pa01S6xvezF6S93P1uN7PZ3REwxXIaOfUeDHk=; b=kW28e0Ss0p6lQedrHVFCRF2SrlRvZIjv+YRlRR8tnd1VR+j73UbpmxeIGFZ8JMv5VLBfaN XAiAQYBrPhzdEfmnW8rI32ddDcea1gxUBbiXKa7z7jSDkfz+zlQTicz4mKaPXfo6xtBeHB b9pHWk0FSBIQ+Rt1hMKz85LqTiKWCXf+ew9awo733jyV79ZrBtcv+4lXp35qcJOEX1yhsK LZI5+22yR7LmpQEzpoDqXqN+ggfq/meLJEa+LRBL9nSIL+0hTKRIKfEeceeWda2IXKOUCh BUJFH0nPT3TLNrHmep8BtzoYWiPF9NjVqoaP16X7xXkicUeIY85JTilka+y3Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jH8Zm4cT9zRZ1 for ; Sat, 31 Oct 2026 20:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33ba7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 31 Oct 2026 20:24:32 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Brad Smith From: Adrian Chadd Subject: git: e50d25ef5aff - stable/15 - rge: handle interface flags changes List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e50d25ef5aff7e4b0033f4a587fe4a743413a1fb Auto-Submitted: auto-generated Date: Sat, 31 Oct 2026 20:24:32 +0000 Message-Id: <6ae64e80.33ba7.618776bc@gitrepo.freebsd.org> The branch stable/15 has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=e50d25ef5aff7e4b0033f4a587fe4a743413a1fb commit e50d25ef5aff7e4b0033f4a587fe4a743413a1fb Author: Brad Smith AuthorDate: 2026-03-25 01:22:52 +0000 Commit: Adrian Chadd CommitDate: 2026-10-31 20:15:05 +0000 rge: handle interface flags changes Handle interface flags like other drivers do. Reviewed by: zlei, adrian Differential Revision: https://reviews.freebsd.org/D55728 (cherry picked from commit f7fd4e79fa0943446aa5900147f737a70c73d9e3) --- sys/dev/rge/if_rge.c | 21 ++++++++------------- sys/dev/rge/if_rgevar.h | 2 ++ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/sys/dev/rge/if_rge.c b/sys/dev/rge/if_rge.c index e5297edfefbe..5ae0b98f95a1 100644 --- a/sys/dev/rge/if_rge.c +++ b/sys/dev/rge/if_rge.c @@ -959,29 +959,24 @@ rge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) case SIOCSIFFLAGS: RGE_LOCK(sc); if ((if_getflags(ifp) & IFF_UP) != 0) { - if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) { - /* - * TODO: handle promisc/iffmulti changing - * without reprogramming everything. - */ + if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { + if (((if_getflags(ifp) ^ sc->rge_if_flags) + & (IFF_PROMISC | IFF_ALLMULTI)) != 0) + rge_iff_locked(sc); + } else rge_init_locked(sc); - } else { - /* Reinit promisc/multi just in case */ - rge_iff_locked(sc); - } } else { - if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { + if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) rge_stop_locked(sc); - } } + sc->rge_if_flags = if_getflags(ifp); RGE_UNLOCK(sc); break; case SIOCADDMULTI: case SIOCDELMULTI: RGE_LOCK(sc); - if ((if_getflags(ifp) & IFF_DRV_RUNNING) != 0) { + if ((if_getflags(ifp) & IFF_DRV_RUNNING) != 0) rge_iff_locked(sc); - } RGE_UNLOCK(sc); break; case SIOCGIFMEDIA: diff --git a/sys/dev/rge/if_rgevar.h b/sys/dev/rge/if_rgevar.h index 6228f9ff229e..d516537e6524 100644 --- a/sys/dev/rge/if_rgevar.h +++ b/sys/dev/rge/if_rgevar.h @@ -200,6 +200,8 @@ struct rge_softc { #define RGE_IMTYPE_SIM 1 int sc_watchdog; + int rge_if_flags; + uint32_t sc_debug; struct rge_drv_stats sc_drv_stats;