From owner-svn-src-projects@FreeBSD.ORG Tue Mar 17 15:04:29 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 41496F40; Tue, 17 Mar 2015 15:04:29 +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 2C981A50; Tue, 17 Mar 2015 15:04:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2HF4TcV040434; Tue, 17 Mar 2015 15:04:29 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2HF4TFW040433; Tue, 17 Mar 2015 15:04:29 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201503171504.t2HF4TFW040433@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 17 Mar 2015 15:04:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280176 - projects/ifnet/sys/net 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: Tue, 17 Mar 2015 15:04:29 -0000 Author: glebius Date: Tue Mar 17 15:04:28 2015 New Revision: 280176 URL: https://svnweb.freebsd.org/changeset/base/280176 Log: The struct ifops is part of new KPI and thus its size and layout should not depend on kernel options, so remove ifop_poll out of ifdef. Modified: projects/ifnet/sys/net/if.h Modified: projects/ifnet/sys/net/if.h ============================================================================== --- projects/ifnet/sys/net/if.h Tue Mar 17 15:03:29 2015 (r280175) +++ projects/ifnet/sys/net/if.h Tue Mar 17 15:04:28 2015 (r280176) @@ -592,10 +592,8 @@ typedef void (*if_qflush_t)(if_t); typedef int (*if_resolvemulti_t)(if_t, struct sockaddr **, struct sockaddr *); typedef void (*if_reassign_t)(if_t, struct vnet *); -#ifdef DEVICE_POLLING enum poll_cmd { POLL_ONLY, POLL_AND_CHECK_STATUS }; -typedef int (*if_poll_t)(if_t ifp, enum poll_cmd cmd, int count); -#endif +typedef int (*if_poll_t)(if_t, enum poll_cmd, int); /* * Interface methods. Usually stored in ifdriver definition, however @@ -606,9 +604,7 @@ struct ifops { if_input_t ifop_input; /* input routine (from h/w driver) */ if_transmit_t ifop_transmit; /* initiate output routine */ if_output_t ifop_output; -#ifdef DEVICE_POLLING if_poll_t ifop_poll; -#endif if_ioctl_t ifop_ioctl; /* ioctl routine */ if_get_counter_t ifop_get_counter; /* get counter values */ if_qflush_t ifop_qflush; /* flush any queue */