From nobody Wed Sep 3 17:20:16 2025 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 4cH8WP3PvGz66lg0; Wed, 03 Sep 2025 17:20:17 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cH8WP0yVQz3D4V; Wed, 03 Sep 2025 17:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756920017; 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=7/hwJ1BpWRNIvTqxkMdXd3BLbiTfsNvuthYdxIw0XvQ=; b=pW6B8DCixqDmnKODBnUhUdhX5mDV321C5JN4F24D0FpZKETP9Jdfjyf6l23et1tmxYXS+Q 687uouwiklJiYNVbXAqrG1AxMu3i/LDrq0q29q4kVbSZ3gqM9wyvFTZupM6okiUBZUBFaJ 7p41rFl96CgB7K0LUvpGzmDrZZ8dyHIk2EAWhiH7e3/SEWaGBIuTxlzmawz7ZAwOX83qCY aWabDDVAETq2AQCAKrRtE8FHU3WzvhRhkix5RbG9YcjfjUs7RuEW7yJYLDobC0CYkaBE9q N9RnLLhcW1pzot7tZi7U1va5jG4odZyjcMw+QTAxSBoFw91s9ZOmRP7d7aupNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756920017; 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=7/hwJ1BpWRNIvTqxkMdXd3BLbiTfsNvuthYdxIw0XvQ=; b=Yd+S7NX+yJkQYgD/7rrLCcY9yo9Ud8yUBDAKLY4rEWgauYEGKfp2TybPRCHgfdaMAPkTPG Hkg5iU9pMPh5kmzBvdgLD+L9snfOLiDerMEBqRCptvhcQlLdSUvVfg/SuxuLwNvLBfHmXm cRx8+1rc5tNeom6kIXayCF8+rBph8tZ3M1SbfUaODAGCvhZiVEAKR13Rq3Z+8uJWUkdvt1 LbWQL00UebltrDonTP07H9rZXZCV2QtRZN9hRGi3BDPWd4LvLEEuvCASykc/R2Xl6x9t7i goH84IL2aqVLu8KBpo8sgqebtuNrzHgT6SdF3Mj4cFSStRJ+ZuV6VrO0cjr6ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756920017; a=rsa-sha256; cv=none; b=Ju9LIK7QRURjKzIb5bniAmmA57SThhTg8NShGYbtJ+zUMJKnWoRez4dUUuU17vIO8KZq9X +7OLgXVr/miefVAcZwdBVLzdhoT5nGq0lbra8EjvC72puEtsQ8BgiLP9XJgJEXrPIodIJc eJCr2VGtJTtK6N5UbgzOwIxth0icOLkgKeTUynlc/2L9LebGuxYCB5qnsOHIJ3DDH4L3fb z4Z6xh0YIN160R9T/ze3cYwrELopyCVs9skJoasO4OKSIs11Yu1LMms8Nh1+8nCq2q1E0p guboDXEEUYChzDpQO1j72zBKe/zyfDFKb6YSYID10EMbahIYRUG8sB2Lg3Rfnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cH8WN6rxlz9HG; Wed, 03 Sep 2025 17:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 583HKGKf019595; Wed, 3 Sep 2025 17:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 583HKGPY019582; Wed, 3 Sep 2025 17:20:16 GMT (envelope-from git) Date: Wed, 3 Sep 2025 17:20:16 GMT Message-Id: <202509031720.583HKGPY019582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: e921d2842ee8 - main - umb: Fix setting the input routine 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: e921d2842ee8ca9e3dae8952e1cf2645cee785aa Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e921d2842ee8ca9e3dae8952e1cf2645cee785aa commit e921d2842ee8ca9e3dae8952e1cf2645cee785aa Author: Zhenlei Huang AuthorDate: 2025-09-03 17:19:37 +0000 Commit: Zhenlei Huang CommitDate: 2025-09-03 17:19:37 +0000 umb: Fix setting the input routine This driver does not depend on netmap, and umb_input() works greatly without netmap. Remove the #ifdef DEV_NETMAP so that when "device netmap" is not configured this driver can still correctly pass the inbound packets to the net stack. Otherwise the input routine will be if_input_default() which will silently drop all inbound packets. PR: 263783 Reported by: Andre Albsmeier Tested by: Andre Albsmeier Differential Revision: https://reviews.freebsd.org/D52182 --- sys/dev/usb/net/if_umb.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/dev/usb/net/if_umb.c b/sys/dev/usb/net/if_umb.c index f640b4224aad..b1082b117259 100644 --- a/sys/dev/usb/net/if_umb.c +++ b/sys/dev/usb/net/if_umb.c @@ -177,9 +177,7 @@ static void umb_ncm_setup(struct umb_softc *, struct usb_config *); static void umb_close_bulkpipes(struct umb_softc *); static int umb_ioctl(if_t , u_long, caddr_t); static void umb_init(void *); -#ifdef DEV_NETMAP static void umb_input(if_t , struct mbuf *); -#endif static int umb_output(if_t , struct mbuf *, const struct sockaddr *, struct route *); static void umb_start(if_t ); @@ -585,9 +583,7 @@ umb_attach_task(struct usb_proc_msg *msg) if_setsoftc(ifp, sc); if_setflags(ifp, IFF_SIMPLEX | IFF_MULTICAST | IFF_POINTOPOINT); if_setioctlfn(ifp, umb_ioctl); -#ifdef DEV_NETMAP if_setinputfn(ifp, umb_input); -#endif if_setoutputfn(ifp, umb_output); if_setstartfn(ifp, umb_start); if_setinitfn(ifp, umb_init);