diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2004-08-09 15:01:09 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2004-08-09 15:01:09 -0700 |
| commit | 7e2aca4a445cb5535d1fbfc850915068488d35a2 (patch) | |
| tree | 4c4e8f026a104133d2c17af316897b264f68f398 /include/linux | |
| parent | a5b62ecbd4a108e595f47a475e7a3acf5ca24f0b (diff) | |
| parent | 2d7b390ca689a3b18d0612627f76748e23d64975 (diff) | |
Merge davem@nuts.davemloft.net:/disk1/BK/net-2.6
into kernel.bkbits.net:/home/davem/net-2.6
Diffstat (limited to 'include/linux')
| -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 46d246bac3bf..420767fcb3c9 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 { |