From 5e60196744fa34f0bd4576743fd36e81a778ff8c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 28 Apr 2010 09:30:00 +0000 Subject: [PATCH] --- yaml --- r: 194599 b: refs/heads/master c: c28884c57400de326ba4c1ff9608f1d425bdd0fd h: refs/heads/master i: 194597: 280b292e337c054a6f2d99060b20eec96fc81dd3 194595: 2587df458fa537174880b304c1095a3716d9d42b 194591: f29f78fe7442e4e339ffca4d987b50221115ee3c v: v3 --- [refs] | 2 +- trunk/drivers/net/sfc/net_driver.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 64f9a360abe9..3aa118d162c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d07df11c4be368681c0b8228c3d80eeb1fcfabd +refs/heads/master: c28884c57400de326ba4c1ff9608f1d425bdd0fd diff --git a/trunk/drivers/net/sfc/net_driver.h b/trunk/drivers/net/sfc/net_driver.h index bdea03c54e07..d68331c7fb5d 100644 --- a/trunk/drivers/net/sfc/net_driver.h +++ b/trunk/drivers/net/sfc/net_driver.h @@ -672,6 +672,7 @@ union efx_multicast_hash { * This register is written with the SMP processor ID whenever an * interrupt is handled. It is used by efx_nic_test_interrupt() * to verify that an interrupt has occurred. + * @irq_zero_count: Number of legacy IRQs seen with queue flags == 0 * @fatal_irq_level: IRQ level (bit number) used for serious errors * @spi_flash: SPI flash device * This field will be %NULL if no flash device is present (or for Siena). @@ -756,7 +757,7 @@ struct efx_nic { struct efx_buffer irq_status; volatile signed int last_irq_cpu; - unsigned long irq_zero_count; + unsigned irq_zero_count; unsigned fatal_irq_level; struct efx_spi_device *spi_flash;