From nobody Wed Feb 11 20:29:51 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 4fB95q4dHmz6S96L for ; Wed, 11 Feb 2026 20:29:51 +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 4fB95q15tlz3HMR for ; Wed, 11 Feb 2026 20:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770841791; 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=oxv9qcxrIRZVPt+564dvqfQKdULgN8bxqQA+OddltU4=; b=E69VscqRYQSTVE1846BVgEkq2n5PzioFsmbf5Q8+y5PD1Pp0GE3dSp7C+GkoFegHQQ8Q3G DCGVyALsjmCunG5/t2psoJ6+g+a/CtMhLVXykoTyO6OLcKtiFdqkj5dH3EYXoHsyi4PEXy MAenWJvVqI9SnUEISr1rY2Q8oE4jfLyLW3OsilKwzYENh9fooBrvx0xoANOMD0tn3JNAMk gtmWgwTLHqtZL5zEKtQocPn6oZ/LyfyqlNdPf03V0nwnrN0/AHnJwryt0GOvatFkmois4E zdN9K7h5AfUphuCGEkyExdazY2si3JMDKBk5b6uqFoFcfoHA3oUVEmMSPTCinw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770841791; a=rsa-sha256; cv=none; b=BiYOnUYXVZNfN4HH3j8aNLZSved66nCoqI3PsEXnjKaB9q9niHuv3PIgZXkFDKByaakLXr x6K8WywonpRFfotpfemBOuPTnivzfrQdA70d5ASDVQZFuJn4fXD5pQxcL4trMxdfImSZHc 7uzISl1D3G3+M2BWPw1aKZ5bGtjh5FK0w9mh4NUabYq/jpO8rn43cwloCkBwYVDs2hL6vT J+8DzV5rENuKQckTc5TDykSyTuB5vrjmhxHHjHKCq3GCOQ5Zk6zHmywLPz5zas4om5gOmx xoyDCW4x9bZI7foF4spMXZv2VNuX3+F7gv4EMap3JfZBVPY9/jKx6loSRq0Eaw== 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=1770841791; 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=oxv9qcxrIRZVPt+564dvqfQKdULgN8bxqQA+OddltU4=; b=C9+7hH5cCMxpG3In8Gf02u5MGp3E6UL8pfi6O15H/0lcnuGe5NXRNRNUfRPtH4qb9ShA3R XmsbfCowizREdfw9Vd1j+95hTYth6VfmXZsZ0s1SyiuL80iG8ekgv/3vni9ZijBnx/igNf XhyzUwOys1+O8sSno5SusDgtaBMrX9ew0KLOjXo+uJYLKH8/Ooz7SeECGJ0eA4SDEx1ET8 jmYDMeiHWP1GKJX9SkZaYDJqA19uigGqpU3Cm4fx9t129+VkhXL1JmRe866jXNt5REph/E O+TWV/wQv+LbH0WwKPAZBah8bSQ0Rs3FbDecSPff14F8e8Iy4dC9Ts2opbcz+A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fB95q0M8nz14TD for ; Wed, 11 Feb 2026 20:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 43c76 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Feb 2026 20:29:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Zhenlei Huang From: Colin Percival Subject: git: be256934d62e - releng/14.4 - 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.4 X-Git-Reftype: branch X-Git-Commit: be256934d62e9462211a94ed72fae8e59aa4df72 Auto-Submitted: auto-generated Date: Wed, 11 Feb 2026 20:29:51 +0000 Message-Id: <698ce6bf.43c76.769cb16f@gitrepo.freebsd.org> The branch releng/14.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=be256934d62e9462211a94ed72fae8e59aa4df72 commit be256934d62e9462211a94ed72fae8e59aa4df72 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:54 +0000 Commit: Colin Percival CommitDate: 2026-02-11 20:29:13 +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 Approved by: re (cperciva) 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) (cherry picked from commit 20ffe22fcfe13b48a8e993cbf565f9cd9229a4b3) --- 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}