svn commit: r205884 - head/sys/dev/e1000
Jack F Vogel
jfv at FreeBSD.org
Tue Mar 30 17:05:25 UTC 2010
Author: jfv
Date: Tue Mar 30 17:05:24 2010
New Revision: 205884
URL: http://svn.freebsd.org/changeset/base/205884
Log:
Fix lint build problem.
Modified:
head/sys/dev/e1000/if_em.c
head/sys/dev/e1000/if_em.h
Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c Tue Mar 30 15:26:12 2010 (r205883)
+++ head/sys/dev/e1000/if_em.c Tue Mar 30 17:05:24 2010 (r205884)
@@ -4823,16 +4823,18 @@ em_print_debug_info(struct adapter *adap
device_printf(dev, "Queue(%d) tdh = %d, tdt = %d\n", i,
E1000_READ_REG(&adapter->hw, E1000_TDH(i)),
E1000_READ_REG(&adapter->hw, E1000_TDT(i)));
- device_printf(dev, "TX(%d) no descriptors avail event = %lld\n",
- txr->me, (long long)txr->no_desc_avail);
- device_printf(dev, "TX(%d) MSIX IRQ Handled = %lld\n", txr->me,
- (long long)txr->tx_irq);
+ device_printf(dev, "TX(%d) no descriptors avail event = %ld\n",
+ txr->me, txr->no_desc_avail);
+ device_printf(dev, "TX(%d) MSIX IRQ Handled = %ld\n",
+ txr->me, txr->tx_irq);
device_printf(dev, "Num Tx descriptors avail = %d\n",
txr->tx_avail);
device_printf(dev, "Tx Descriptors not avail1 = %ld\n",
txr->no_desc_avail);
}
for (int i = 0; i < adapter->num_queues; i++, rxr++) {
+ device_printf(dev, "RX(%d) MSIX IRQ Handled = %ld\n",
+ rxr->me, rxr->rx_irq);
device_printf(dev, "hw rdh = %d, hw rdt = %d\n",
E1000_READ_REG(&adapter->hw, E1000_RDH(i)),
E1000_READ_REG(&adapter->hw, E1000_RDT(i)));
Modified: head/sys/dev/e1000/if_em.h
==============================================================================
--- head/sys/dev/e1000/if_em.h Tue Mar 30 15:26:12 2010 (r205883)
+++ head/sys/dev/e1000/if_em.h Tue Mar 30 17:05:24 2010 (r205884)
@@ -291,8 +291,8 @@ struct tx_ring {
bus_dma_tag_t txtag;
void *tag;
struct resource *res;
- u64 tx_irq;
- u64 no_desc_avail;
+ unsigned long tx_irq;
+ unsigned long no_desc_avail;
};
/*
@@ -310,8 +310,8 @@ struct rx_ring {
struct taskqueue *tq;
struct e1000_rx_desc *rx_base;
struct em_dma_alloc rxdma;
- unsigned int next_to_refresh;
- unsigned int next_to_check;
+ u32 next_to_refresh;
+ u32 next_to_check;
struct em_buffer *rx_buffers;
struct mbuf *fmp;
struct mbuf *lmp;
@@ -323,9 +323,9 @@ struct rx_ring {
bus_dmamap_t rx_sparemap;
/* Soft stats */
- u64 rx_irq;
- u64 rx_packets;
- u64 rx_bytes;
+ unsigned long rx_irq;
+ unsigned long rx_packets;
+ unsigned long rx_bytes;
};
More information about the svn-src-all
mailing list