From nobody Tue Jan 24 20:48:21 2023 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 4P1fFL3jChz3bSZg; Tue, 24 Jan 2023 20:48:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P1fFL1639z42Dr; Tue, 24 Jan 2023 20:48:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674593302; 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=qE5Sd3cKB6O6Ce/dwn0LGjblf4rE3b4ML2QL1Bi5zzo=; b=ZTvairdpqb+Hv8kHabkKRCxvV6/wDiPqLi1ojB5bc8z+W9pGVCBeasVxFcSIBRXCsp53k5 GgbZ26IQ///kC4xUHBi3LvVQJQabpKHfG9baDQRjiYaSl40qGtdvhnkGoAL49unprO0mFV NGEkFTdiWY4jtmZSqeYQuTKBQUDWboIAZTstDoehEmJQTzOZWIZLZOAQR5b/mqtejH5t1e ZwGT6tK9XuMOH+JxOtC4DDOnD63xPNO6uy6F4tIXG8tgwW/G00WD6nd5gClVMhSiOGnve/ xRUv6Q5dymk4ZC6rMWZj8fIwIQspBcYNH8EMOgS7lZFOzd68WH+x71N8owkoCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674593302; 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=qE5Sd3cKB6O6Ce/dwn0LGjblf4rE3b4ML2QL1Bi5zzo=; b=RpIYPn7xVbeWdTyOQ7ixt5ok9PJhrsggXWjFwpQJfuaRe7N6By/yDaidMrNbvm/GZo/qlM 9p55hAWkeHu6yahiBiyCfHcFW5rqKy5DjK2O83Ee+sDtu6+KXjGV5iA6HodXe0ziPwjJ6c VMD7rLc+yvCXliN9pVXXOkG/WAZJ6JZ5KV6vTFMduAw8ehDpXwG8dh6/FNvS0wlDwVGfFB nI21FcRxEPq4wAChkcVNJk7CS7RZA7QkmZtpR/xzJ8TnIFwHPVXjSDR3cXpDqUOtVEX+dq Xgz4OmEUi6J63KAiICqndtKvsSUbfV15WQcLvgJ0z2gI6uTM9Rc6rz2jR75BrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674593302; a=rsa-sha256; cv=none; b=HuECI/vnD3+OAY5Drg3u2kTXmkwxKG8KaPkMhJuZJCea+GOZFTKJp+/W+zzApbT8yf7mx6 hz4qMfB1culFai7LsjWx+oJ3ljbSh1A6plfnSnOTm16NPIa8S1dqZlf2olLDPRNWBYECbi JxjoBkAQGKQF5t96yEGVd3pp0zK153xXQ0bMNQFOgs9ikUnslayYurQJCR2kyTwEFC+miu X8L+OMJT8CrtInnb/X5nJHFIkXmuqbSrKEVA3Ob2B5n/yIEdGCgpDp4W6p2Zp/n/zBmaTR jUVMCAUTU7vHE01EQz3H3phkfDQcYIQdyqWNMBp1UwprL58h8jhJcuNQcBABQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P1fFK5qztzN8F; Tue, 24 Jan 2023 20:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30OKmLgT053844; Tue, 24 Jan 2023 20:48:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OKmLA5053843; Tue, 24 Jan 2023 20:48:21 GMT (envelope-from git) Date: Tue, 24 Jan 2023 20:48:21 GMT Message-Id: <202301242048.30OKmLA5053843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: fa25dbfd98ff - main - ifnet API: Change if_init() to take context argument 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa25dbfd98ff58556d707a94a8355626b681c65f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=fa25dbfd98ff58556d707a94a8355626b681c65f commit fa25dbfd98ff58556d707a94a8355626b681c65f Author: Justin Hibbits AuthorDate: 2023-01-12 18:33:30 +0000 Commit: Justin Hibbits CommitDate: 2023-01-24 19:36:30 +0000 ifnet API: Change if_init() to take context argument Some drivers, like iflib drivers, take a 'context' argument instead of a ifnet argument, as a single interface may have multiple contexts. Follow this scheme by passing the context argument down. Most drivers will likely pass 'ifp' as the context. Reviewed by: glebius Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D38102 --- sys/net/if.c | 4 ++-- sys/net/if_var.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index c7b7d1f6d9d4..c7a6cf18d4b7 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -4622,9 +4622,9 @@ if_vlantrunkinuse(if_t ifp) } int -if_init(if_t ifp) +if_init(if_t ifp, void *ctx) { - (*((struct ifnet *)ifp)->if_init)((struct ifnet *)ifp); + (*((struct ifnet *)ifp)->if_init)(ctx); return (0); } diff --git a/sys/net/if_var.h b/sys/net/if_var.h index 2712ac74a09d..afb58578e96b 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -784,7 +784,7 @@ void if_bpfmtap(if_t ifp, struct mbuf *m); void if_etherbpfmtap(if_t ifp, struct mbuf *m); void if_vlancap(if_t ifp); int if_transmit(if_t ifp, struct mbuf *m); -int if_init(if_t ifp); +int if_init(if_t ifp, void *ctx); /* * Traversing through interface address lists.