Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 1 Aug 2016 21:19:52 +0000 (UTC)
From:      Sean Bruno <sbruno@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r303638 - head/sys/dev/e1000
Message-ID:  <201608012119.u71LJqV4092307@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sbruno
Date: Mon Aug  1 21:19:51 2016
New Revision: 303638
URL: https://svnweb.freebsd.org/changeset/base/303638

Log:
  r293331 mistakingly failed to add an assignment of paddr to the rxbuf
  but only in the NETMAP code.  This lead to the NETMAP code paths
  passing nothing up to userland.
  
  Submitted by:	Ad Schellevis <ad@opnsense.org>
  Reported by:	Franco Fichtner <franco@opnsense.org>
  MFC after:	1 day

Modified:
  head/sys/dev/e1000/if_em.c

Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c	Mon Aug  1 20:54:54 2016	(r303637)
+++ head/sys/dev/e1000/if_em.c	Mon Aug  1 21:19:51 2016	(r303638)
@@ -4392,6 +4392,7 @@ em_setup_receive_ring(struct rx_ring *rx
 
 			addr = PNMB(na, slot + si, &paddr);
 			netmap_load_map(na, rxr->rxtag, rxbuf->map, addr);
+			rxbuf->paddr = paddr;
 			em_setup_rxdesc(&rxr->rx_base[j], rxbuf);
 			continue;
 		}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608012119.u71LJqV4092307>