From nobody Wed Feb 11 13:49:08 2026 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 4fB0CT0HW5z6RVdb for ; Wed, 11 Feb 2026 13:49:09 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fB0CS51GXz3bBN for ; Wed, 11 Feb 2026 13:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770817748; 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=yP4MlAZ+SErwhWdFXRSzetK2UivpXlT4BMld5R24Fww=; b=fz7u50Eqs+zN8V7ckB7VzRn2kzVPT4DzwSdOTwNGA+59bY/78QxsgavfYwvycI64T8dut7 sSjkKxNm4YvgUXRMwBSskIIVEjlRol7wPbEzh34ndPMdoV+g8BjEFEw9jEMSekab6vTaCg T/gmwwnp1qXUg3fsz9yStns4QmBJJLKTs/MsMxxOsltResITBiU5QAkOfdfSFhTGnli1Rz hfBkh1NoRLCL4B98msV91KwgDXuq2hNSBX4CammKvdw7MsX4eJSJPbBIvWYx0q2hbE/cPe yAUEfS7sfMV6LIZPOb5pk5KwDavfaq1yIE1OGLr6klUXZiAebe9ovqdcIZGxQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770817748; a=rsa-sha256; cv=none; b=uQvHDDW6gh08HgkxqjHkVriffJMGJWQ1K6nmTNwPadTvS15CFvSKMyqC3L58bXo08w/1tq qCIXPgUmaX+FeFkW/hzanKa1p9RFrIxzBQxs+OJvuwTFM3i+lQuu9Q0jww9r+1D7bpnbJI jo1x7T5x/Fk0sMIncQTq0SlWsi+uSsHFAL/3Zfuq49hpig2NPajPWvPR29z4mXJ4Vdf8kb 0w7zJpEu23Wxxa0bX//IxYlWdHPBiH0Wu08BkOOWLXqcVpdZmlvGBd49hhcifxSkHAawtQ wYVJLU1x1A/Pi64wG2xxqi5/UmM+9ud0OW177rQh8enPSrZTcRkfmHKw8nNObA== 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=1770817748; 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=yP4MlAZ+SErwhWdFXRSzetK2UivpXlT4BMld5R24Fww=; b=c2z52H7Tymd/NgQWXFlmRC+LJ3UzrY9Ebx4rlhebnyBO0z2va8F2N8l7/Ta1b4RfcTV2Bg 0Zxm2NPSL+WzBzdPopKaAXJwImU8DiAVccUbC2hW7t6agSOJ+DWuxHCddbKcW3eWZ3mVjq LrAuhLNqiPc/zt4Mqrmr98Bp2duz6Z+4WS09YDpLIZR3OWUYaqmjYxActTmvP7zn2r7QW3 criQBOKYWavKAPWzhuHzDidH4VEi3GE6LZYsLfbTO9/NcsYAV9zjOU2kh3UsPJkrRmCBMm xw4vTAWNwtOid+XaVrV0idBKDcYmoGHwWtap/qBK9zgqA91QPZ8U2dVMaMQdOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB0CS4K8Kzs3J for ; Wed, 11 Feb 2026 13:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b429 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 13:49:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 20ffe22fcfe1 - stable/14 - qlnxe: Let ether_ioctl() handle SIOCSIFADDR ioctl 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 20ffe22fcfe13b48a8e993cbf565f9cd9229a4b3 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 13:49:08 +0000 Message-Id: <698c88d4.3b429.7fa08413@gitrepo.freebsd.org> The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=20ffe22fcfe13b48a8e993cbf565f9cd9229a4b3 commit 20ffe22fcfe13b48a8e993cbf565f9cd9229a4b3 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:54 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-11 13:48:08 +0000 qlnxe: Let ether_ioctl() handle SIOCSIFADDR ioctl Since the change [1], the init routine qlnx_init() works as intended. Let ether_ioctl() handle SIOCSIFADDR to simplify the code. Combined with the change [1], this shall be a better fix for PR 287445. [1] c10e6bc0f007 qlnxe: Avoid reinitializing the interface when it is already initialized PR: 287445 Reviewed by: kbowling MFC after: 5 days Differential Revision: https://reviews.freebsd.org/D54888 (cherry picked from commit 4012b63889e40bb877bc0e4c8da1792bce472c08) (cherry picked from commit 0f383f74b7398161c12a290e50b060baf45d2800) --- sys/dev/qlnx/qlnxe/qlnx_os.c | 25 ------------------------- sys/modules/qlnx/qlnxe/Makefile | 1 - 2 files changed, 26 deletions(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index bc0282e3c22b..8a12d45512ac 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -30,8 +30,6 @@ * Author : David C Somayajulu, Cavium, Inc., San Jose, CA 95131. */ -#include "opt_inet.h" - #include #include "qlnx_os.h" #include "bcm_osal.h" @@ -2622,34 +2620,11 @@ qlnx_ioctl(if_t ifp, u_long cmd, caddr_t data) int ret = 0, mask; int flags; struct ifreq *ifr = (struct ifreq *)data; -#ifdef INET - struct ifaddr *ifa = (struct ifaddr *)data; -#endif qlnx_host_t *ha; ha = (qlnx_host_t *)if_getsoftc(ifp); switch (cmd) { - case SIOCSIFADDR: - QL_DPRINT4(ha, "SIOCSIFADDR (0x%lx)\n", cmd); - -#ifdef INET - if (ifa->ifa_addr->sa_family == AF_INET) { - if_setflagbits(ifp, IFF_UP, 0); - QLNX_LOCK(ha); - if ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) == 0) - qlnx_init_locked(ha); - QLNX_UNLOCK(ha); - QL_DPRINT4(ha, "SIOCSIFADDR (0x%lx) ipv4 [0x%08x]\n", - cmd, ntohl(IA_SIN(ifa)->sin_addr.s_addr)); - - arp_ifinit(ifp, ifa); - break; - } -#endif - ether_ioctl(ifp, cmd, data); - break; - case SIOCSIFMTU: QL_DPRINT4(ha, "SIOCSIFMTU (0x%lx)\n", cmd); diff --git a/sys/modules/qlnx/qlnxe/Makefile b/sys/modules/qlnx/qlnxe/Makefile index 2a44ae6ddde5..3d8415cf0e57 100644 --- a/sys/modules/qlnx/qlnxe/Makefile +++ b/sys/modules/qlnx/qlnxe/Makefile @@ -58,7 +58,6 @@ SRCS+=qlnx_rdma.c SRCS+=qlnx_ioctl.c SRCS+=qlnx_os.c -SRCS+=opt_inet.h SRCS+= ${LINUXKPI_GENSRCS}