svn commit: r303638 - head/sys/dev/e1000

Sean Bruno sbruno at FreeBSD.org
Mon Aug 1 21:19:53 UTC 2016


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 at opnsense.org>
  Reported by:	Franco Fichtner <franco at 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;
 		}


More information about the svn-src-head mailing list