From owner-svn-soc-all@freebsd.org Fri Jun 17 16:21:44 2016 Return-Path: Delivered-To: svn-soc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4259BA774A7 for ; Fri, 17 Jun 2016 16:21:44 +0000 (UTC) (envelope-from vincenzo@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 3615223EE for ; Fri, 17 Jun 2016 16:21:44 +0000 (UTC) (envelope-from vincenzo@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u5HGLiD2018322 for ; Fri, 17 Jun 2016 16:21:44 GMT (envelope-from vincenzo@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u5HGLhwx018309 for svn-soc-all@FreeBSD.org; Fri, 17 Jun 2016 16:21:43 GMT (envelope-from vincenzo@FreeBSD.org) Date: Fri, 17 Jun 2016 16:21:43 GMT Message-Id: <201606171621.u5HGLhwx018309@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to vincenzo@FreeBSD.org using -f From: vincenzo@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r305286 - soc2016/vincenzo/head/sys/dev/netmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jun 2016 16:21:44 -0000 Author: vincenzo Date: Fri Jun 17 16:21:43 2016 New Revision: 305286 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305286 Log: freebsd: ptnet: use if_transmit interface for transmission Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Modified: soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c ============================================================================== --- soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Fri Jun 17 15:06:49 2016 (r305285) +++ soc2016/vincenzo/head/sys/dev/netmap/if_ptnet.c Fri Jun 17 16:21:43 2016 (r305286) @@ -104,7 +104,7 @@ }; struct ptnet_softc { - device_t dev; + device_t dev; struct ifnet *ifp; struct ifmedia media; struct mtx core_mtx; @@ -156,7 +156,8 @@ static int ptnet_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data); static int ptnet_init_locked(struct ptnet_softc *sc); static int ptnet_stop(struct ptnet_softc *sc); -static void ptnet_start(struct ifnet *ifp); +static int ptnet_transmit(struct ifnet *ifp, struct mbuf *m); +static void ptnet_qflush(struct ifnet *ifp); static int ptnet_media_change(struct ifnet *ifp); static void ptnet_media_status(struct ifnet *ifp, struct ifmediareq *ifmr); @@ -318,7 +319,8 @@ ifp->if_flags = IFF_BROADCAST | IFF_MULTICAST | IFF_SIMPLEX; ifp->if_init = ptnet_init; ifp->if_ioctl = ptnet_ioctl; - ifp->if_start = ptnet_start; + ifp->if_transmit = ptnet_transmit; + ifp->if_qflush = ptnet_qflush; IFQ_SET_MAXLEN(&ifp->if_snd, 255); ifp->if_snd.ifq_drv_maxlen = 255; @@ -708,8 +710,19 @@ return 0; } +static int +ptnet_transmit(struct ifnet *ifp, struct mbuf *m) +{ + struct ptnet_softc *sc = ifp->if_softc; + + device_printf(sc->dev, "transmit %p\n", m); + m_freem(m); + + return 0; +} + static void -ptnet_start(struct ifnet *ifp) +ptnet_qflush(struct ifnet *ifp) { }