summaryrefslogtreecommitdiffstats
path: root/sys/dev/pci/if_ix.c
diff options
context:
space:
mode:
authormikeb <mikeb@openbsd.org>2014-08-26 11:01:21 +0000
committermikeb <mikeb@openbsd.org>2014-08-26 11:01:21 +0000
commit32e893b26152ffe97c074b1ca792ee9ccd4cf52c (patch)
tree3cffbd56ad939f393b36cdbdd103137556f2e22c /sys/dev/pci/if_ix.c
parentBase system special services have no flags, so move the test for them (diff)
downloadwireguard-openbsd-32e893b26152ffe97c074b1ca792ee9ccd4cf52c.tar.xz
wireguard-openbsd-32e893b26152ffe97c074b1ca792ee9ccd4cf52c.zip
Revert part of the if_rxr diff that incorrectly moves RX ring tail
index update code from the buf_get success path to the do it all the time code path. Tested by millert; ok dlg, deraadt
Diffstat (limited to 'sys/dev/pci/if_ix.c')
-rw-r--r--sys/dev/pci/if_ix.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/if_ix.c b/sys/dev/pci/if_ix.c
index e55b0452693..855e82aa75f 100644
--- a/sys/dev/pci/if_ix.c
+++ b/sys/dev/pci/if_ix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ix.c,v 1.98 2014/08/25 14:26:25 mikeb Exp $ */
+/* $OpenBSD: if_ix.c,v 1.99 2014/08/26 11:01:22 mikeb Exp $ */
/******************************************************************************
@@ -2599,11 +2599,11 @@ ixgbe_rxfill(struct rx_ring *rxr)
if (ixgbe_get_buf(rxr, i) != 0)
break;
+ rxr->last_desc_filled = i;
post = 1;
}
- if_rxr_put(&rxr->rx_ring, slots);
- rxr->last_desc_filled = i;
+ if_rxr_put(&rxr->rx_ring, slots);
return (post);
}