diff options
| author | Linus Torvalds | 2011-03-10 01:45:02 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2011-03-10 01:45:02 +0100 |
| commit | ab02a9540541dd7b2012f32f5e311c3cbd772387 (patch) | |
| tree | 47b2795e160b0f095840ded0bb7f4c7af237eb41 /include/linux | |
| parent | sysctl: the include of rcupdate.h is only needed in the kernel (diff) | |
| parent | net: don't allow CAP_NET_ADMIN to load non-netdev kernel modules (diff) | |
| download | kernel-qcow2-linux-ab02a9540541dd7b2012f32f5e311c3cbd772387.tar.gz kernel-qcow2-linux-ab02a9540541dd7b2012f32f5e311c3cbd772387.tar.xz kernel-qcow2-linux-ab02a9540541dd7b2012f32f5e311c3cbd772387.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
net: don't allow CAP_NET_ADMIN to load non-netdev kernel modules
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index d971346b0340..71caf7a5e6c6 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2392,6 +2392,9 @@ extern int netdev_notice(const struct net_device *dev, const char *format, ...) extern int netdev_info(const struct net_device *dev, const char *format, ...) __attribute__ ((format (printf, 2, 3))); +#define MODULE_ALIAS_NETDEV(device) \ + MODULE_ALIAS("netdev-" device) + #if defined(DEBUG) #define netdev_dbg(__dev, format, args...) \ netdev_printk(KERN_DEBUG, __dev, format, ##args) |