diff options
| author | Jeff Muizelaar <muizelaar@rogers.com> | 2003-05-25 05:22:47 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-05-25 05:22:47 -0700 |
| commit | a8f8aaee58eececd21f7af0602f98a6782001634 (patch) | |
| tree | 1685a146e3028f2f2b72a26a733517a210913f87 | |
| parent | 4a14ac720b4a056248c1b4c5b730b6129cbf08ce (diff) | |
[NET]: post-sysfs netdev cleanup.
| -rw-r--r-- | include/linux/netdevice.h | 5 | ||||
| -rw-r--r-- | net/core/net-sysfs.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 7106c2eaf67e..e445c167c919 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -441,9 +441,6 @@ struct net_device struct divert_blk *divert; #endif /* CONFIG_NET_DIVERT */ - /* generic device structure used in constructing class */ - struct device *dev; - /* class/net/name entry */ struct class_device class_dev; @@ -455,7 +452,7 @@ struct net_device /* 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)->dev = (pdev)) +#define SET_NETDEV_DEV(net, pdev) ((net)->class_dev.dev = (pdev)) struct packet_type diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index e4f69ff53bf6..e0da193e98fb 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -291,9 +291,7 @@ int netdev_register_sysfs(struct net_device *net) struct class_device_attribute *attr; int ret; - memset(class_dev, 0, sizeof(struct class_device)); class_dev->class = &net_class; - class_dev->dev = net->dev; class_dev->class_data = net; snprintf(class_dev->class_id, BUS_ID_SIZE, net->name); |