Module Name: src
Committed By: msaitoh
Date: Tue Mar 6 03:47:23 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.h
Log Message:
Move the location of "struct work" as FreeBSD's "struct task" in ixgbe.h.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/ixgbe/ixgbe.h
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/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.32 src/sys/dev/pci/ixgbe/ixgbe.h:1.33
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.32 Fri Mar 2 10:19:20 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.h Tue Mar 6 03:47:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.32 2018/03/02 10:19:20 knakahara Exp $ */
+/* $NetBSD: ixgbe.h,v 1.33 2018/03/06 03:47:23 msaitoh Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -332,6 +332,7 @@ struct ix_queue {
int busy;
struct tx_ring *txr;
struct rx_ring *rxr;
+ struct work wq_cookie;
void *que_si;
struct evcnt irqs;
char namebuf[32];
@@ -339,8 +340,6 @@ struct ix_queue {
kmutex_t im_mtx; /* lock for im_nest and this queue's EIMS/EIMC bit */
int im_nest;
-
- struct work wq_cookie;
};
/*
@@ -363,6 +362,7 @@ struct tx_ring {
ixgbe_dma_tag_t *txtag;
char mtx_name[16];
pcq_t *txr_interq;
+ struct work wq_cookie;
void *txr_si;
/* Flow Director */
@@ -376,8 +376,6 @@ struct tx_ring {
struct evcnt no_desc_avail;
struct evcnt total_packets;
struct evcnt pcq_drops;
-
- struct work wq_cookie;
};
