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

Hans Petter Selasky hselasky at FreeBSD.org
Sat Aug 1 20:40:38 UTC 2015


Author: hselasky
Date: Sat Aug  1 20:40:37 2015
New Revision: 286162
URL: https://svnweb.freebsd.org/changeset/base/286162

Log:
  Free mbufs when busdma loading fails.
  
  Reviewed by:	erj, sbruno
  MFC after:	1 month

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

Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c	Sat Aug  1 17:48:35 2015	(r286161)
+++ head/sys/dev/e1000/if_em.c	Sat Aug  1 20:40:37 2015	(r286162)
@@ -2029,9 +2029,6 @@ retry:
 		/* Try it again, but only once */
 		remap = 0;
 		goto retry;
-	} else if (error == ENOMEM) {
-		adapter->no_tx_dma_setup++;
-		return (error);
 	} else if (error != 0) {
 		adapter->no_tx_dma_setup++;
 		m_freem(*m_headp);

Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c	Sat Aug  1 17:48:35 2015	(r286161)
+++ head/sys/dev/e1000/if_igb.c	Sat Aug  1 20:40:37 2015	(r286162)
@@ -1908,9 +1908,6 @@ retry:
 				goto retry;
 			} else
 				return (error);
-		case ENOMEM:
-			txr->no_tx_dma_setup++;
-			return (error);
 		default:
 			txr->no_tx_dma_setup++;
 			m_freem(*m_headp);


More information about the svn-src-all mailing list