summaryrefslogtreecommitdiff
path: root/drivers/net/s2io.h
diff options
context:
space:
mode:
authorSreenivasa Honnur <Sreenivasa.Honnur@neterion.com>2008-05-12 21:41:32 +0400
committerJeff Garzik <jgarzik@redhat.com>2008-05-22 14:26:19 +0400
commitac731ab66960547c33a4e2c504419389ae747067 (patch)
treebbede8dbb9ee6044838bc09f68adfaf4c5d87b32 /drivers/net/s2io.h
parent25c16fffa8ed82d3ef31980d76ff95d3c6430f00 (diff)
downloadlinux-ac731ab66960547c33a4e2c504419389ae747067.tar.xz
S2io: Move all the transmit completions to a single msi-x (alarm) vector
- Move all the transmit completions to a single msi-x (alarm) vector. - Enable the continuous timer interrupt for only one transmit fifo. Signed-off-by: Santosh Rastapur <santosh.rastapur@neterion.com> Signed-off-by: Ramkrishna Vepa <ram.vepa@neterion.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/s2io.h')
-rw-r--r--drivers/net/s2io.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h
index 0709ebae9139..9a4b772f7411 100644
--- a/drivers/net/s2io.h
+++ b/drivers/net/s2io.h
@@ -849,8 +849,8 @@ struct s2io_msix_entry
void *arg;
u8 type;
-#define MSIX_FIFO_TYPE 1
-#define MSIX_RING_TYPE 2
+#define MSIX_ALARM_TYPE 1
+#define MSIX_RING_TYPE 2
u8 in_use;
#define MSIX_REGISTERED_SUCCESS 0xAA
@@ -982,6 +982,7 @@ struct s2io_nic {
u16 lro_max_aggr_per_sess;
volatile unsigned long state;
u64 general_int_mask;
+
#define VPD_STRING_LEN 80
u8 product_name[VPD_STRING_LEN];
u8 serial_num[VPD_STRING_LEN];