From owner-svn-src-projects@FreeBSD.ORG Fri Jan 16 19:05:17 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 6EBDAF15; Fri, 16 Jan 2015 19:05:17 +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 41BE31000; Fri, 16 Jan 2015 19:05:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0GJ5HN6031013; Fri, 16 Jan 2015 19:05:17 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0GJ5G6a031007; Fri, 16 Jan 2015 19:05:16 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201501161905.t0GJ5G6a031007@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 16 Jan 2015 19:05:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r277260 - 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: Fri, 16 Jan 2015 19:05:17 -0000 Author: glebius Date: Fri Jan 16 19:05:15 2015 New Revision: 277260 URL: https://svnweb.freebsd.org/changeset/base/277260 Log: Most drivers need to call if_input() and some if_transmit(). Allow that providing non-inline versions of the functions. The code that includes if_var.h will continue to use inline functions. Sponsored by: Nginx, Inc. Modified: projects/ifnet/sys/net/if.c projects/ifnet/sys/net/if.h projects/ifnet/sys/net/if_var.h Modified: projects/ifnet/sys/net/if.c ============================================================================== --- projects/ifnet/sys/net/if.c Fri Jan 16 18:59:15 2015 (r277259) +++ projects/ifnet/sys/net/if.c Fri Jan 16 19:05:15 2015 (r277260) @@ -3720,8 +3720,15 @@ if_snd_prepend(if_t ifp, struct mbuf *m) * Implementation of if ops, that can be called from drivers. */ void -if_input(if_t ifp, struct mbuf *m) +if_input_noinline(if_t ifp, struct mbuf *m) { - return (ifp->if_ops->ifop_input(ifp, m)); + return (if_input(ifp, m)); +} + +int +if_transmit_noinline(if_t ifp, struct mbuf *m) +{ + + return (if_transmit(ifp, m)); } Modified: projects/ifnet/sys/net/if.h ============================================================================== --- projects/ifnet/sys/net/if.h Fri Jan 16 18:59:15 2015 (r277259) +++ projects/ifnet/sys/net/if.h Fri Jan 16 19:05:15 2015 (r277260) @@ -708,7 +708,6 @@ struct if_attach_args { */ if_t if_attach(struct if_attach_args *); void if_detach(if_t); -void if_input(if_t, struct mbuf *); void if_mtap(if_t, struct mbuf *, void *, u_int); void if_inc_counter(if_t, ift_counter, int64_t); void if_inc_txcounters(if_t, struct mbuf *); @@ -722,6 +721,14 @@ uint64_t if_flagbits(if_t, ift_feature, uint64_t if_get_counter_default(if_t, ift_counter); /* + * Interface if_ops that are available for drivers. + */ +void if_input_noinline(if_t, struct mbuf *); +#define if_input(ifp, m) if_input_noinline(ifp, m) +int if_transmit_noinline(if_t, struct mbuf *); +#define if_transmit(ifp, m) if_transmit_noinline(ifp, m) + +/* * Traversing through interface address lists. */ typedef void ifaddr_cb_t(void *, struct sockaddr *, struct sockaddr *, Modified: projects/ifnet/sys/net/if_var.h ============================================================================== --- projects/ifnet/sys/net/if_var.h Fri Jan 16 18:59:15 2015 (r277259) +++ projects/ifnet/sys/net/if_var.h Fri Jan 16 19:05:15 2015 (r277260) @@ -444,6 +444,15 @@ if_init(if_t ifp, void *sc) return (ifp->if_ops->ifop_init(sc)); } +#undef if_input +static inline void +if_input(if_t ifp, struct mbuf *m) +{ + + return (ifp->if_ops->ifop_input(ifp, m)); +} + +#undef if_transmit static inline int if_transmit(if_t ifp, struct mbuf *m) {