diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 10:23:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-18 10:23:37 -0700 |
| commit | 31bdc5dc7666aa2fe04c626cea30fe3c20cf481c (patch) | |
| tree | a1a78a39379e081e9982c3273a71b4e93e8c1fd0 /drivers/net/sunvnet.h | |
| parent | 5cc97bf2d8eaa6cab60727c3eba3e85e29062669 (diff) | |
| parent | a5f8967e171a6fa27da8e6d06d3ef85f7fed43c1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Set vio->desc_buf to NULL after freeing.
[SPARC]: Mark sparc and sparc64 as not having virt_to_bus
[SPARC64]: Fix reset handling in VNET driver.
[SPARC64]: Handle reset events in vio_link_state_change().
[SPARC64]: Handle LDC resets properly in domain-services driver.
[SPARC64]: Massively simplify VIO device layer and support hot add/remove.
[SPARC64]: Simplify VNET probing.
[SPARC64]: Simplify VDC device probing.
[SPARC64]: Add basic infrastructure for MD add/remove notification.
Diffstat (limited to 'drivers/net/sunvnet.h')
| -rw-r--r-- | drivers/net/sunvnet.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/sunvnet.h b/drivers/net/sunvnet.h index 1c887302d46..7d3a0cac727 100644 --- a/drivers/net/sunvnet.h +++ b/drivers/net/sunvnet.h @@ -60,11 +60,13 @@ struct vnet { struct net_device *dev; u32 msg_enable; - struct vio_dev *vdev; struct list_head port_list; struct hlist_head port_hash[VNET_PORT_HASH_SIZE]; + + struct list_head list; + u64 local_mac; }; #endif /* _SUNVNET_H */ |