diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-09 20:00:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-09 20:00:51 -0700 |
| commit | 69bbb2ba68a02a9918feac48c43af24eb2aa9625 (patch) | |
| tree | b370ab08bcdd8c8468c05600ef46871dafb9c67a /include | |
| parent | 9a976cc6ebc7aa38ddc3b2b83f7d788aba1285e2 (diff) | |
| parent | 7e2aca4a445cb5535d1fbfc850915068488d35a2 (diff) | |
| download | history-69bbb2ba68a02a9918feac48c43af24eb2aa9625.tar.gz | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_vlan.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 46d246bac3bfbc..420767fcb3c96a 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -22,6 +22,7 @@ struct sk_buff; struct packet_type; struct vlan_collection; struct vlan_dev_info; +struct hlist_node; #include <linux/proc_fs.h> /* for proc_dir_entry */ #include <linux/netdevice.h> @@ -67,9 +68,9 @@ extern void vlan_ioctl_set(int (*hook)(void __user *)); struct vlan_group { int real_dev_ifindex; /* The ifindex of the ethernet(like) device the vlan is attached to. */ + struct hlist_node hlist; /* linked list */ struct net_device *vlan_devices[VLAN_GROUP_ARRAY_LEN]; - - struct vlan_group *next; /* the next in the list */ + struct rcu_head rcu; }; struct vlan_priority_tci_mapping { |