Module Name: src
Committed By: msaitoh
Date: Tue Apr 17 08:38:05 UTC 2018
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c ixgbe.c ixgbe.h ixv.c
Log Message:
Remove unused structure entries. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.147 -r1.148 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.93 -r1.94 src/sys/dev/pci/ixgbe/ixv.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.39 src/sys/dev/pci/ixgbe/ix_txrx.c:1.40
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.39 Wed Apr 4 08:13:07 2018
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Tue Apr 17 08:38:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.39 2018/04/04 08:13:07 msaitoh Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.40 2018/04/17 08:38:05 msaitoh Exp $ */
/******************************************************************************
@@ -494,8 +494,7 @@ retry:
segaddr = htole64(map->dm_segs[j].ds_addr);
txd->read.buffer_addr = segaddr;
- txd->read.cmd_type_len = htole32(txr->txd_cmd |
- cmd_type_len | seglen);
+ txd->read.cmd_type_len = htole32(cmd_type_len | seglen);
txd->read.olinfo_status = htole32(olinfo_status);
if (++i == txr->num_desc)
@@ -2266,8 +2265,6 @@ ixgbe_allocate_queues(struct adapter *ad
txr->num_desc = adapter->num_tx_desc;
/* Initialize the TX side lock */
- snprintf(txr->mtx_name, sizeof(txr->mtx_name), "%s:tx(%d)",
- device_xname(dev), txr->me);
mutex_init(&txr->tx_mtx, MUTEX_DEFAULT, IPL_NET);
if (ixgbe_dma_malloc(adapter, tsize, &txr->txdma,
@@ -2318,8 +2315,6 @@ ixgbe_allocate_queues(struct adapter *ad
rxr->num_desc = adapter->num_rx_desc;
/* Initialize the RX side lock */
- snprintf(rxr->mtx_name, sizeof(rxr->mtx_name), "%s:rx(%d)",
- device_xname(dev), rxr->me);
mutex_init(&rxr->rx_mtx, MUTEX_DEFAULT, IPL_NET);
if (ixgbe_dma_malloc(adapter, rsize, &rxr->rxdma,
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.147 src/sys/dev/pci/ixgbe/ixgbe.c:1.148
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.147 Tue Apr 17 05:23:58 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Apr 17 08:38:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.147 2018/04/17 05:23:58 knakahara Exp $ */
+/* $NetBSD: ixgbe.c,v 1.148 2018/04/17 08:38:05 msaitoh Exp $ */
/******************************************************************************
@@ -6282,7 +6282,6 @@ ixgbe_allocate_msix(struct adapter *adap
adapter->osdep.intrs[vector], IPL_NET, ixgbe_msix_link, adapter,
intr_xname);
if (adapter->osdep.ihs[vector] == NULL) {
- adapter->res = NULL;
aprint_error_dev(dev, "Failed to register LINK handler\n");
error = ENXIO;
goto err_out;
Index: src/sys/dev/pci/ixgbe/ixgbe.h
diff -u src/sys/dev/pci/ixgbe/ixgbe.h:1.42 src/sys/dev/pci/ixgbe/ixgbe.h:1.43
--- src/sys/dev/pci/ixgbe/ixgbe.h:1.42 Tue Apr 17 05:23:58 2018
+++ src/sys/dev/pci/ixgbe/ixgbe.h Tue Apr 17 08:38:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.h,v 1.42 2018/04/17 05:23:58 knakahara Exp $ */
+/* $NetBSD: ixgbe.h,v 1.43 2018/04/17 08:38:05 msaitoh Exp $ */
/******************************************************************************
SPDX-License-Identifier: BSD-3-Clause
@@ -322,11 +322,9 @@ struct ixgbe_mc_addr {
struct ix_queue {
struct adapter *adapter;
u32 msix; /* This queue's MSI-X vector */
- u32 eims; /* This queue's EIMS bit */
u32 eitr_setting;
u32 me;
struct resource *res;
- void *tag;
int busy;
struct tx_ring *txr;
struct rx_ring *rxr;
@@ -365,9 +363,10 @@ struct tx_ring {
u16 next_avail_desc;
u16 next_to_clean;
u16 num_desc;
- u32 txd_cmd;
ixgbe_dma_tag_t *txtag;
- char mtx_name[16];
+#if 0
+ char mtx_name[16]; /* NetBSD has no mutex name */
+#endif
pcq_t *txr_interq;
struct work wq_cookie;
void *txr_si;
@@ -415,7 +414,9 @@ struct rx_ring {
u16 next_to_check;
u16 num_desc;
u16 mbuf_sz;
- char mtx_name[16];
+#if 0
+ char mtx_name[16]; /* NetBSD has no mutex name */
+#endif
struct ixgbe_rx_buf *rx_buffers;
ixgbe_dma_tag_t *ptag;
@@ -461,17 +462,10 @@ struct adapter {
struct resource *pci_mem;
struct resource *msix_mem;
- /*
- * Interrupt resources: this set is
- * either used for legacy, or for Link
- * when doing MSI-X
- */
- void *tag;
- struct resource *res;
+ /* NetBSD: Interrupt resources are in osdep */
struct ifmedia media;
callout_t timer;
- int link_rid;
int if_flags;
kmutex_t core_mtx;
Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.93 src/sys/dev/pci/ixgbe/ixv.c:1.94
--- src/sys/dev/pci/ixgbe/ixv.c:1.93 Thu Apr 12 08:03:55 2018
+++ src/sys/dev/pci/ixgbe/ixv.c Tue Apr 17 08:38:05 2018
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.93 2018/04/12 08:03:55 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.94 2018/04/17 08:38:05 msaitoh Exp $*/
/******************************************************************************
@@ -2985,7 +2985,6 @@ ixv_allocate_msix(struct adapter *adapte
adapter->osdep.intrs[vector], IPL_NET, ixv_msix_mbx, adapter,
intr_xname);
if (adapter->osdep.ihs[vector] == NULL) {
- adapter->res = NULL;
aprint_error_dev(dev, "Failed to register LINK handler\n");
kcpuset_destroy(affinity);
return (ENXIO);
