From owner-svn-soc-all@FreeBSD.ORG Sun Jun 7 03:25:28 2015 Return-Path: Delivered-To: svn-soc-all@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 76FB1D01 for ; Sun, 7 Jun 2015 03:25:28 +0000 (UTC) (envelope-from btw@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 65B6211D0 for ; Sun, 7 Jun 2015 03:25:28 +0000 (UTC) (envelope-from btw@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id t573PSLK029526 for ; Sun, 7 Jun 2015 03:25:28 GMT (envelope-from btw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id t573PRuA029524 for svn-soc-all@FreeBSD.org; Sun, 7 Jun 2015 03:25:27 GMT (envelope-from btw@FreeBSD.org) Date: Sun, 7 Jun 2015 03:25:27 GMT Message-Id: <201506070325.t573PRuA029524@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to btw@FreeBSD.org using -f From: btw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r286764 - soc2015/btw/head/sys/dev/re 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.20 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: Sun, 07 Jun 2015 03:25:28 -0000 Author: btw Date: Sun Jun 7 03:25:26 2015 New Revision: 286764 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=286764 Log: Convert re(4) to use the per-ring counters. Modified: soc2015/btw/head/sys/dev/re/if_re.c Modified: soc2015/btw/head/sys/dev/re/if_re.c ============================================================================== --- soc2015/btw/head/sys/dev/re/if_re.c Sat Jun 6 22:03:24 2015 (r286763) +++ soc2015/btw/head/sys/dev/re/if_re.c Sun Jun 7 03:25:26 2015 (r286764) @@ -1230,6 +1230,7 @@ .ifat_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST, .ifat_capabilities = IFCAP_LINKSTATE, .ifat_mediamask = MII_MEDIA_MASK, + .ifat_nrings = 1, }; u_char eaddr[ETHER_ADDR_LEN]; u_int16_t as[ETHER_ADDR_LEN / 2]; @@ -2152,6 +2153,7 @@ { struct mbuf *m; if_t ifp; + ifring_t *ifrs, ifr; int i, rxerr, total_len; struct rl_desc *cur_rx; u_int32_t rxstat, rxvlan; @@ -2160,6 +2162,8 @@ RL_LOCK_ASSERT(sc); ifp = sc->rl_ifp; + ifrs = if_getsoftc(ifp, IF_RING); + ifr = ifrs[0]; #ifdef DEV_NETMAP if (netmap_rx_irq(ifp, 0, &rx_npkts)) return 0; @@ -2321,6 +2325,7 @@ if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); if_inc_counter(ifp, IFCOUNTER_IBYTES, m->m_pkthdr.len); m->m_pkthdr.rcvif = ifp; + m->m_pkthdr.ifring = ifr; /* Do RX checksumming if enabled */