Module Name: src
Committed By: msaitoh
Date: Wed Jan 18 08:15:22 UTC 2017
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c
Log Message:
Call ixgbe_free_transmit_buffers instead of ixgbe_free_transmit_structures()
in ixgbe_allocate_transmit_buffers()...
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ixgbe/ix_txrx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.14 src/sys/dev/pci/ixgbe/ix_txrx.c:1.15
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.14 Thu Jan 5 05:53:23 2017
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Wed Jan 18 08:15:22 2017
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: head/sys/dev/ixgbe/ix_txrx.c 301538 2016-06-07 04:51:50Z sephe $*/
-/*$NetBSD: ix_txrx.c,v 1.14 2017/01/05 05:53:23 msaitoh Exp $*/
+/*$NetBSD: ix_txrx.c,v 1.15 2017/01/18 08:15:22 msaitoh Exp $*/
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -567,7 +567,11 @@ ixgbe_allocate_transmit_buffers(struct t
return 0;
fail:
/* We free all, it handles case where we are in the middle */
+#if 0 /* XXX was FreeBSD */
ixgbe_free_transmit_structures(adapter);
+#else
+ ixgbe_free_transmit_buffers(txr);
+#endif
return (error);
}
