git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
linux
/
if_vlan.h
diff --git
a/include/linux/if_vlan.h
b/include/linux/if_vlan.h
index
420767f
..
46d246b
100644
(file)
--- a/
include/linux/if_vlan.h
+++ b/
include/linux/if_vlan.h
@@
-22,7
+22,6
@@
struct sk_buff;
struct packet_type;
struct vlan_collection;
struct vlan_dev_info;
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>
#include <linux/proc_fs.h> /* for proc_dir_entry */
#include <linux/netdevice.h>
@@
-68,9
+67,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 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 net_device *vlan_devices[VLAN_GROUP_ARRAY_LEN];
- struct rcu_head rcu;
+
+ struct vlan_group *next; /* the next in the list */
};
struct vlan_priority_tci_mapping {
};
struct vlan_priority_tci_mapping {