diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-08 09:11:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-08 09:11:10 -0700 |
| commit | 96b8eaa14a20771997b501a049e418b871bf9def (patch) | |
| tree | 31d9724f7628fab85bbb0a08e694450770494e96 /include/linux/netdevice.h | |
| parent | bed7a560333d40269a886c4421d4c8f964a32177 (diff) | |
| parent | 0eb1bd210d94e9f2c87551d794bb2755e5e24eed (diff) | |
| download | kernel_samsung_crespo-96b8eaa14a20771997b501a049e418b871bf9def.zip kernel_samsung_crespo-96b8eaa14a20771997b501a049e418b871bf9def.tar.gz kernel_samsung_crespo-96b8eaa14a20771997b501a049e418b871bf9def.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[IRDA] irda-usb: use NULL instead of 0
[IPV4]: Remove likely in ip_rcv_finish()
[NET]: Create netdev attribute_groups with class_device_add
[CLASS DEVICE]: add attribute_group creation
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 01db7b8..309f919 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -506,6 +506,8 @@ struct net_device /* class/net/name entry */ struct class_device class_dev; + /* space for optional statistics and wireless sysfs groups */ + struct attribute_group *sysfs_groups[3]; }; #define NETDEV_ALIGN 32 |