aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/skge.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/skge.h')
-rw-r--r--drivers/net/skge.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/net/skge.h b/drivers/net/skge.h
index 1a57bdd1ddf1..17caccbb7685 100644
--- a/drivers/net/skge.h
+++ b/drivers/net/skge.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Definitions for the new Marvell Yukon / SysKonenct driver. 2 * Definitions for the new Marvell Yukon / SysKonnect driver.
3 */ 3 */
4#ifndef _SKGE_H 4#ifndef _SKGE_H
5#define _SKGE_H 5#define _SKGE_H
@@ -8,8 +8,10 @@
8#define PCI_DEV_REG1 0x40 8#define PCI_DEV_REG1 0x40
9#define PCI_PHY_COMA 0x8000000 9#define PCI_PHY_COMA 0x8000000
10#define PCI_VIO 0x2000000 10#define PCI_VIO 0x2000000
11
11#define PCI_DEV_REG2 0x44 12#define PCI_DEV_REG2 0x44
12#define PCI_REV_DESC 0x4 13#define PCI_VPD_ROM_SZ 7L<<14 /* VPD ROM size 0=256, 1=512, ... */
14#define PCI_REV_DESC 1<<2 /* Reverse Descriptor bytes */
13 15
14#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \ 16#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
15 PCI_STATUS_SIG_SYSTEM_ERROR | \ 17 PCI_STATUS_SIG_SYSTEM_ERROR | \
@@ -2191,11 +2193,9 @@ enum {
2191 XM_IS_TXF_UR = 1<<2, /* Bit 2: Transmit FIFO Underrun */ 2193 XM_IS_TXF_UR = 1<<2, /* Bit 2: Transmit FIFO Underrun */
2192 XM_IS_TX_COMP = 1<<1, /* Bit 1: Frame Tx Complete */ 2194 XM_IS_TX_COMP = 1<<1, /* Bit 1: Frame Tx Complete */
2193 XM_IS_RX_COMP = 1<<0, /* Bit 0: Frame Rx Complete */ 2195 XM_IS_RX_COMP = 1<<0, /* Bit 0: Frame Rx Complete */
2194};
2195
2196#define XM_DEF_MSK (~(XM_IS_INP_ASS | XM_IS_LIPA_RC | \
2197 XM_IS_RXF_OV | XM_IS_TXF_UR))
2198 2196
2197 XM_IMSK_DISABLE = 0xffff,
2198};
2199 2199
2200/* XM_HW_CFG 16 bit r/w Hardware Config Register */ 2200/* XM_HW_CFG 16 bit r/w Hardware Config Register */
2201enum { 2201enum {
@@ -2469,8 +2469,9 @@ struct skge_port {
2469 void *mem; /* PCI memory for rings */ 2469 void *mem; /* PCI memory for rings */
2470 dma_addr_t dma; 2470 dma_addr_t dma;
2471 unsigned long mem_size; 2471 unsigned long mem_size;
2472 2472#ifdef CONFIG_SKGE_DEBUG
2473 struct net_device_stats net_stats; 2473 struct dentry *debugfs;
2474#endif
2474}; 2475};
2475 2476
2476 2477