diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2002-04-09 12:14:34 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 10:37:11 -0800 |
| commit | 43cb76d91ee85f579a69d42bc8efc08bac560278 (patch) | |
| tree | f5c4766a6639fee3685dbbfc9110bb334af9e6dd /include/linux/netdevice.h | |
| parent | 2943ecf2ed32632473c06f1975db47a7aa98c10f (diff) | |
| download | kernel-crypto-43cb76d91ee85f579a69d42bc8efc08bac560278.tar.gz kernel-crypto-43cb76d91ee85f579a69d42bc8efc08bac560278.tar.xz kernel-crypto-43cb76d91ee85f579a69d42bc8efc08bac560278.zip | |
Network: convert network devices to use struct device instead of class_device
This lets the network core have the ability to handle suspend/resume
issues, if it wants to.
Thanks to Frederik Deweerdt <frederik.deweerdt@gmail.com> for the arm
driver fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index fea0d9db684..2e37f501278 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -529,10 +529,11 @@ struct net_device struct net_bridge_port *br_port; /* class/net/name entry */ - struct class_device class_dev; + struct device dev; /* space for optional statistics and wireless sysfs groups */ struct attribute_group *sysfs_groups[3]; }; +#define to_net_dev(d) container_of(d, struct net_device, dev) #define NETDEV_ALIGN 32 #define NETDEV_ALIGN_CONST (NETDEV_ALIGN - 1) @@ -548,7 +549,7 @@ static inline void *netdev_priv(struct net_device *dev) /* Set the sysfs physical device reference for the network logical device * if set prior to registration will cause a symlink during initialization. */ -#define SET_NETDEV_DEV(net, pdev) ((net)->class_dev.dev = (pdev)) +#define SET_NETDEV_DEV(net, pdev) ((net)->dev.parent = (pdev)) struct packet_type { __be16 type; /* This is really htons(ether_type). */ |