diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 17:35:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 17:35:25 -0700 |
| commit | c2e68052429fdf87702fccd272951282bef1c60a (patch) | |
| tree | b9f3bf3918526af068ed264190a85fb18dd3d8b0 /drivers/net/sunvnet.h | |
| parent | d6f410bdbcb435c744c4f8259d6659ae2c6e447a (diff) | |
| parent | 1256efd5519a8eca2dfa6039ce5cf58f44d1626d (diff) | |
| download | kernel_samsung_espresso10-c2e68052429fdf87702fccd272951282bef1c60a.zip kernel_samsung_espresso10-c2e68052429fdf87702fccd272951282bef1c60a.tar.gz kernel_samsung_espresso10-c2e68052429fdf87702fccd272951282bef1c60a.tar.bz2 | |
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]: fix section mismatch warning in mdesc.c
[SPARC64]: fix section mismatch warning in pci_sunv4
[SPARC64]: Stop using drivers/char/rtc.c
[SPARC64]: Convert parport to of_platform_driver.
[SPARC]: Implement fb_is_primary_device().
[SPARC64]: Fix virq decomposition.
[SPARC64]: Use KERN_ERR in IRQ manipulation error printks.
[SPARC64]: Do not flood log with failed DS messages.
[SPARC64]: Add proper multicast support to VNET driver.
[SPARC64]: Handle multiple domain-services-port nodes properly.
[SPARC64]: Improve VIO device naming further.
[SPARC]: Make sure dev_archdata is filled in for all devices.
[SPARC]: Define minimal struct dev_archdata, similarly to sparc64.
[SPARC]: Fix serial console device detection.
Diffstat (limited to 'drivers/net/sunvnet.h')
| -rw-r--r-- | drivers/net/sunvnet.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/sunvnet.h b/drivers/net/sunvnet.h index 7d3a0ca..d347a5b 100644 --- a/drivers/net/sunvnet.h +++ b/drivers/net/sunvnet.h @@ -30,6 +30,8 @@ struct vnet_port { struct hlist_node hash; u8 raddr[ETH_ALEN]; + u8 switch_port; + u8 __pad; struct vnet *vp; @@ -53,6 +55,13 @@ static inline unsigned int vnet_hashfn(u8 *mac) return val & (VNET_PORT_HASH_MASK); } +struct vnet_mcast_entry { + u8 addr[ETH_ALEN]; + u8 sent; + u8 hit; + struct vnet_mcast_entry *next; +}; + struct vnet { /* Protects port_list and port_hash. */ spinlock_t lock; @@ -65,6 +74,8 @@ struct vnet { struct hlist_head port_hash[VNET_PORT_HASH_SIZE]; + struct vnet_mcast_entry *mcast_list; + struct list_head list; u64 local_mac; }; |