From owner-svn-src-projects@FreeBSD.ORG Mon Mar 23 15:27:37 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A45EE99D; Mon, 23 Mar 2015 15:27:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 85684D2A; Mon, 23 Mar 2015 15:27:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2NFRbls035945; Mon, 23 Mar 2015 15:27:37 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2NFRY4o035919; Mon, 23 Mar 2015 15:27:34 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201503231527.t2NFRY4o035919@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Mon, 23 Mar 2015 15:27:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280373 - in projects/ifnet/sys: dev/bge dev/e1000 dev/msk dev/usb dev/virtio/network dev/xl net netgraph X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Mar 2015 15:27:37 -0000 Author: glebius Date: Mon Mar 23 15:27:33 2015 New Revision: 280373 URL: https://svnweb.freebsd.org/changeset/base/280373 Log: Let the stack initialize ifop_origin for drivers ifops. Modified: projects/ifnet/sys/dev/bge/if_bge.c projects/ifnet/sys/dev/e1000/if_igb.c projects/ifnet/sys/dev/msk/if_msk.c projects/ifnet/sys/dev/usb/usb_pf.c projects/ifnet/sys/dev/virtio/network/if_vtnet.c projects/ifnet/sys/dev/xl/if_xl.c projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if_loop.c projects/ifnet/sys/netgraph/ng_iface.c Modified: projects/ifnet/sys/dev/bge/if_bge.c ============================================================================== --- projects/ifnet/sys/dev/bge/if_bge.c Mon Mar 23 15:21:54 2015 (r280372) +++ projects/ifnet/sys/dev/bge/if_bge.c Mon Mar 23 15:27:33 2015 (r280373) @@ -533,7 +533,6 @@ static driver_t bge_driver = { static struct ifdriver bge_ifdrv = { .ifdrv_ops = { - .ifop_origin = IFOP_ORIGIN_DRIVER, .ifop_ioctl = bge_ioctl, .ifop_transmit = bge_transmit, .ifop_get_counter = bge_get_counter, Modified: projects/ifnet/sys/dev/e1000/if_igb.c ============================================================================== --- projects/ifnet/sys/dev/e1000/if_igb.c Mon Mar 23 15:21:54 2015 (r280372) +++ projects/ifnet/sys/dev/e1000/if_igb.c Mon Mar 23 15:27:33 2015 (r280373) @@ -306,7 +306,6 @@ static driver_t igb_driver = { static struct ifdriver igb_ifdrv = { .ifdrv_ops = { - .ifop_origin = IFOP_ORIGIN_DRIVER, .ifop_ioctl = igb_ioctl, .ifop_get_counter = igb_get_counter, .ifop_transmit = igb_mq_start, Modified: projects/ifnet/sys/dev/msk/if_msk.c ============================================================================== --- projects/ifnet/sys/dev/msk/if_msk.c Mon Mar 23 15:21:54 2015 (r280372) +++ projects/ifnet/sys/dev/msk/if_msk.c Mon Mar 23 15:27:33 2015 (r280373) @@ -396,7 +396,6 @@ static struct resource_spec msk_irq_spec static struct ifdriver msk_ifdrv = { .ifdrv_ops = { - .ifop_origin = IFOP_ORIGIN_DRIVER, .ifop_ioctl = msk_ioctl, .ifop_transmit = msk_transmit, }, Modified: projects/ifnet/sys/dev/usb/usb_pf.c ============================================================================== --- projects/ifnet/sys/dev/usb/usb_pf.c Mon Mar 23 15:21:54 2015 (r280372) +++ projects/ifnet/sys/dev/usb/usb_pf.c Mon Mar 23 15:27:33 2015 (r280373) @@ -74,9 +74,6 @@ static uint32_t usbpf_xfer_precompute_si static const char usbusname[] = "usbus"; static struct ifdriver usbpf_ifdrv = { - .ifdrv_ops = { - .ifop_origin = IFOP_ORIGIN_DRIVER, - }, .ifdrv_name = usbusname, .ifdrv_type = IFT_USB, /* Modified: projects/ifnet/sys/dev/virtio/network/if_vtnet.c ============================================================================== --- projects/ifnet/sys/dev/virtio/network/if_vtnet.c Mon Mar 23 15:21:54 2015 (r280372) +++ projects/ifnet/sys/dev/virtio/network/if_vtnet.c Mon Mar 23 15:27:33 2015 (r280373) @@ -296,7 +296,6 @@ MODULE_DEPEND(vtnet, virtio, 1, 1, 1); static struct ifdriver vtnet_ifdrv = { .ifdrv_ops = { - .ifop_origin = IFOP_ORIGIN_DRIVER, .ifop_ioctl = vtnet_ioctl, .ifop_get_counter = vtnet_get_counter, .ifop_transmit = vtnet_txq_mq_start, Modified: projects/ifnet/sys/dev/xl/if_xl.c ============================================================================== --- projects/ifnet/sys/dev/xl/if_xl.c Mon Mar 23 15:21:54 2015 (r280372) +++ projects/ifnet/sys/dev/xl/if_xl.c Mon Mar 23 15:27:33 2015 (r280373) @@ -329,7 +329,6 @@ DRIVER_MODULE(miibus, xl, miibus_driver, static struct ifdriver xl_ifdrv = { .ifdrv_ops = { - .ifop_origin = IFOP_ORIGIN_DRIVER, .ifop_ioctl = xl_ioctl, .ifop_transmit = xl_transmit, #ifdef DEVICE_POLLING Modified: projects/ifnet/sys/net/if.c ============================================================================== --- projects/ifnet/sys/net/if.c Mon Mar 23 15:21:54 2015 (r280372) +++ projects/ifnet/sys/net/if.c Mon Mar 23 15:27:33 2015 (r280373) @@ -482,6 +482,7 @@ ifdriver_bless(struct ifdriver *ifdrv, s ifdrv->ifdrv_name)); #endif + ifdrv->ifdrv_ops.ifop_origin = IFOP_ORIGIN_DRIVER; ifdrv->ifdrv_flags |= IFDRV_BLESSED; } Modified: projects/ifnet/sys/net/if_loop.c ============================================================================== --- projects/ifnet/sys/net/if_loop.c Mon Mar 23 15:21:54 2015 (r280372) +++ projects/ifnet/sys/net/if_loop.c Mon Mar 23 15:27:33 2015 (r280373) @@ -103,7 +103,6 @@ static const char loname[] = "lo"; static struct ifdriver lo_ifdrv = { .ifdrv_ops = { - .ifop_origin = IFOP_ORIGIN_DRIVER, .ifop_ioctl = loioctl, .ifop_output = looutput, }, Modified: projects/ifnet/sys/netgraph/ng_iface.c ============================================================================== --- projects/ifnet/sys/netgraph/ng_iface.c Mon Mar 23 15:21:54 2015 (r280372) +++ projects/ifnet/sys/netgraph/ng_iface.c Mon Mar 23 15:27:33 2015 (r280373) @@ -193,7 +193,6 @@ static VNET_DEFINE(struct unrhdr *, ng_i static struct ifdriver ng_ifdrv = { .ifdrv_ops = { - .ifop_origin = IFOP_ORIGIN_DRIVER, .ifop_output = ng_iface_output, .ifop_transmit = ng_iface_transmit, .ifop_ioctl = ng_iface_ioctl,