diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 20:48:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 20:48:54 -0400 |
commit | 1f1c2881f673671539b25686df463518d69c4649 (patch) | |
tree | 45f4a79f2371ae4525fd621d4b5820732efa161e /drivers/net/ehea/ehea.h | |
parent | 7608a864e5211df1e3c1948e2719aec7c27b9333 (diff) | |
parent | c5e3ae8823693b260ce1f217adca8add1bc0b3de (diff) |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
forcedeth bug fix: realtek phy
forcedeth bug fix: vitesse phy
forcedeth bug fix: cicada phy
atl1: reorder atl1_main functions
atl1: fix excessively indented code
atl1: cleanup atl1_main
atl1: header file cleanup
atl1: remove irq_sem
cdc-subset to support new vendor/product ID
8139cp: implement the missing dev->tx_timeout
myri10ge: Remove nonsensical limit in the tx done routine
gianfar: kill unused header
EP93XX_ETH must select MII
macb: Add multicast capability
macb: Use generic PHY layer
s390: add barriers to qeth driver
s390: scatter-gather for inbound traffic in qeth driver
eHEA: Introducing support vor DLPAR memory add
Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c
[PATCH] softmac: Fix ESSID problem
...
Diffstat (limited to 'drivers/net/ehea/ehea.h')
-rw-r--r-- | drivers/net/ehea/ehea.h | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h index f03f070451de..6628fa622e2c 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ehea/ehea.h | |||
@@ -39,13 +39,13 @@ | |||
39 | #include <asm/io.h> | 39 | #include <asm/io.h> |
40 | 40 | ||
41 | #define DRV_NAME "ehea" | 41 | #define DRV_NAME "ehea" |
42 | #define DRV_VERSION "EHEA_0067" | 42 | #define DRV_VERSION "EHEA_0070" |
43 | 43 | ||
44 | /* EHEA capability flags */ | 44 | /* eHEA capability flags */ |
45 | #define DLPAR_PORT_ADD_REM 1 | 45 | #define DLPAR_PORT_ADD_REM 1 |
46 | #define DLPAR_MEM_ADD 2 | 46 | #define DLPAR_MEM_ADD 2 |
47 | #define DLPAR_MEM_REM 4 | 47 | #define DLPAR_MEM_REM 4 |
48 | #define EHEA_CAPABILITIES (DLPAR_PORT_ADD_REM) | 48 | #define EHEA_CAPABILITIES (DLPAR_PORT_ADD_REM) |
49 | 49 | ||
50 | #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ | 50 | #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ |
51 | | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR) | 51 | | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR) |
@@ -113,6 +113,8 @@ | |||
113 | /* Memory Regions */ | 113 | /* Memory Regions */ |
114 | #define EHEA_MR_ACC_CTRL 0x00800000 | 114 | #define EHEA_MR_ACC_CTRL 0x00800000 |
115 | 115 | ||
116 | #define EHEA_BUSMAP_START 0x8000000000000000ULL | ||
117 | |||
116 | #define EHEA_WATCH_DOG_TIMEOUT 10*HZ | 118 | #define EHEA_WATCH_DOG_TIMEOUT 10*HZ |
117 | 119 | ||
118 | /* utility functions */ | 120 | /* utility functions */ |
@@ -186,6 +188,12 @@ struct h_epas { | |||
186 | set to 0 if unused */ | 188 | set to 0 if unused */ |
187 | }; | 189 | }; |
188 | 190 | ||
191 | struct ehea_busmap { | ||
192 | unsigned int entries; /* total number of entries */ | ||
193 | unsigned int valid_sections; /* number of valid sections */ | ||
194 | u64 *vaddr; | ||
195 | }; | ||
196 | |||
189 | struct ehea_qp; | 197 | struct ehea_qp; |
190 | struct ehea_cq; | 198 | struct ehea_cq; |
191 | struct ehea_eq; | 199 | struct ehea_eq; |
@@ -382,6 +390,8 @@ struct ehea_adapter { | |||
382 | struct ehea_mr mr; | 390 | struct ehea_mr mr; |
383 | u32 pd; /* protection domain */ | 391 | u32 pd; /* protection domain */ |
384 | u64 max_mc_mac; /* max number of multicast mac addresses */ | 392 | u64 max_mc_mac; /* max number of multicast mac addresses */ |
393 | int active_ports; | ||
394 | struct list_head list; | ||
385 | }; | 395 | }; |
386 | 396 | ||
387 | 397 | ||
@@ -431,6 +441,9 @@ struct port_res_cfg { | |||
431 | int max_entries_rq3; | 441 | int max_entries_rq3; |
432 | }; | 442 | }; |
433 | 443 | ||
444 | enum ehea_flag_bits { | ||
445 | __EHEA_STOP_XFER | ||
446 | }; | ||
434 | 447 | ||
435 | void ehea_set_ethtool_ops(struct net_device *netdev); | 448 | void ehea_set_ethtool_ops(struct net_device *netdev); |
436 | int ehea_sense_port_attr(struct ehea_port *port); | 449 | int ehea_sense_port_attr(struct ehea_port *port); |