From nobody Fri Feb 6 17:59:31 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 4f720h1Qv1z6RVsR for ; Fri, 06 Feb 2026 17:59: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 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 4f720g62Vkz4KWL for ; Fri, 06 Feb 2026 17:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770400771; 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=IffgaKZtJFyrXClQBXqQsqI1mdVft+JA3WrwV82Qbqw=; b=p3A87KnAuO1k+KeTpHMAGoSSNSoO1X8cGwNcWznjmJ2+0xDmGHzwamnr7vS9WRl5qzYsUv htUrSr1tvFJ0S4+qtwZc3Vv38aKsL0EeSxZLqpsVF300v+7xJJSQh7Sq69k78ArVdZ6i2A GAvaKVrBSIhmnSfWHcf0+IQ3LkoSuehNQ9HMWwE/XcZQOmOtqbwtPB6cvxL/XVGAFtRVjd Etp2nMWTEUShaxy5C+4/BUyKoFUhAI+QE4oCvpAujEWiYJKro7k1udj0041hAlHWkMALzc YgUcr2/f0popxd1hV5+VeMYnx6QQWd8aXZ8ccH36bAAjR3Ilwgglb+o4Rb6bmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770400771; a=rsa-sha256; cv=none; b=AruOQ4x4iyUFT83SD6aODo7AsRvC40Cdh24JyeoZuAlcqZw9ETJvhjM/AsgnryzPCGuyyl I1Nf5meKR2D4a+FDHmJMytxmow1Rudl8bcDVBhA7M0LCyn0TUBjlvfhUPv8cx7tsRUNCdn WtwTETcpPbu7bG3btNxMWBQP/sLpZmxQLXpsFiW72lirmnNSRIanvmqwxQHmVAs2ZuDZkK D+7NZYRimRPceXW3x305on3tIYFcMkMECj3BWHckCqfI8la7EAbWM1SKP7P/gvM/g7Lvtz Ze4g6YZ/ze/yZ5OVEY0T2nMazZdokvodhG1rj2msC8+nHxIfFGYJ34mO+4x1LA== 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=1770400771; 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=IffgaKZtJFyrXClQBXqQsqI1mdVft+JA3WrwV82Qbqw=; b=RzaB4rPyMNMdY/3ct0FXW6zIhfmZsZEjFg4+ux5oSHnjBMelG5kLzlg7uZ6aXoU3V0oeX3 dbDTv3CZzvZPE+Z11wsvptI9VdqxjZK57a5TLsUT0KIceFsGhORWwECYkiN9C8pSUk7gDw Mafu48rbh43zqD1j7Fw1+vnO4ADaGSCLQA9kweyNCVY97XPg7cgk1voI9f3+moHfZPRQm8 uTLtCWJ6dodlbXy/AE1yfwTARbzJM/3QH66A2K7vGcinC/SH65Fw+UbvwPwGTK7XysYUmN Ky4ewNYucf3mBVmaZia0QQDGGW7hx+EmhckDFmIGqo2pSuaBxxSNbXe5lvQeYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f720g4mJvz9yb for ; Fri, 06 Feb 2026 17:59:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 276fc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 06 Feb 2026 17:59:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 4012b63889e4 - main - qlnxe: Let ether_ioctl() handle SIOCSIFADDR ioctl 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4012b63889e40bb877bc0e4c8da1792bce472c08 Auto-Submitted: auto-generated Date: Fri, 06 Feb 2026 17:59:31 +0000 Message-Id: <69862c03.276fc.16278089@gitrepo.freebsd.org> The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4012b63889e40bb877bc0e4c8da1792bce472c08 commit 4012b63889e40bb877bc0e4c8da1792bce472c08 Author: Zhenlei Huang AuthorDate: 2026-02-06 17:52:54 +0000 Commit: Zhenlei Huang CommitDate: 2026-02-06 17:54:15 +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 --- 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}