From nobody Wed Mar 25 01:29:55 2026 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 4fgTq82LQGz6WVWc for ; Wed, 25 Mar 2026 01:29:56 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fgTq803hfz3Scd for ; Wed, 25 Mar 2026 01:29:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774402196; 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=Y64k7zpKoKVxvBnEFmzJPjyFxBBvF8L18CSpNL1pUCE=; b=O/DYwhHkL7BuunfQndC8ach72kE00bp+rvDBaY1kmJkxf1evc7uXs9FzN/Q/CTFZHwyHcU N/UAMwM8Q3ApspQDFKBGEBYED8WVGpQaY3Yg+VrRA0ryK7rVM3EE8zxPgfwHqcV/tInxZ8 6LteDBnjYDLpkXal5ajM7Cpf8cIOiPDlOI5eba6asyc9/QhVyTSC/iFJKInljuq1V28ONW UCk5Pc0eVMVoNMW1k1zGI0hOSvp6SZ8dola6rd/ARnV/k9QLuejca7dLIcgHoo5GCc7tMG pC38vvfRXugMhhiJa/XEzWlRd/Jvw8hP4SVzXio/UZG8qji8z0Q4wwpWvQYX7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774402196; a=rsa-sha256; cv=none; b=YxrtwdwBLpVUJid8XKElYmN4X7WRcMsVz+zFXQmD8ZOnjW9JAF16RuAqKdk7ltgKdWJSwX SnfA2BcwilQb03I+MsCOj6JIKA5nEG/LaAkmW4H9K6XS66Omlo+kGY2/H5OI9FzCZFoPpT LkoVSUuqjz05ErUyfDF9vd2bLIKBgwQuSgWXsehhZJ2/+caNZrcjUhUYI9TlqhYLpDCAIZ f1piMV4+tEAiC4SL2a150C6c4jqqQG2+Sfm/e9gh1Ww1YgbxL633xg41lmWXTjAJ+faumj PfWD1/isDvgT4ozGtA8muXJCoPq6L6dYQ36Q6hunp6e4A60193W9KUxYzFLLaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774402196; 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=Y64k7zpKoKVxvBnEFmzJPjyFxBBvF8L18CSpNL1pUCE=; b=Pdd/oLWhoLyJ3Kh8j6u8oHiykSQgNhpBg6aK1jGv3BxvEsnsiOEWzhjTvRvgdu4h1par5v X8jRljcAOJCh+yK/vgSgpSAjBgzCi6kgykTBb+sqzR59spall5GLtd87bf0SWJJ9uL6B13 IUumo7JEcTXMTGRa1/l9D4l+0jaWoU4QYZArBU7rplsoRbGSSpYjbjUC0InOqoxPOWgqmb Jd5+nK1b17+2SKtyX6P4EzjwDmKzrKMp/9Iq3QXht913lPCUBZlZ1rgM0Pl45utZ54627k jDLVrhUzK0nJYE9sqdEdtgdotSgyTZBsSTY/A0jV6AvYYhNUXsF/J6807NmVTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fgTq740wczkWl for ; Wed, 25 Mar 2026 01:29:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1895d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 25 Mar 2026 01:29:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Brad Smith From: Adrian Chadd Subject: git: f7fd4e79fa09 - main - rge: handle interface flags changes 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: f7fd4e79fa0943446aa5900147f737a70c73d9e3 Auto-Submitted: auto-generated Date: Wed, 25 Mar 2026 01:29:55 +0000 Message-Id: <69c33a93.1895d.63e7c35d@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=f7fd4e79fa0943446aa5900147f737a70c73d9e3 commit f7fd4e79fa0943446aa5900147f737a70c73d9e3 Author: Brad Smith AuthorDate: 2026-03-25 01:22:52 +0000 Commit: Adrian Chadd CommitDate: 2026-03-25 01:22:52 +0000 rge: handle interface flags changes Handle interface flags like other drivers do. Reviewed by: zlei, adrian Differential Revision: https://reviews.freebsd.org/D55728 --- 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;