diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 19:45:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-09 19:45:02 -0500 |
| commit | ab02a9540541dd7b2012f32f5e311c3cbd772387 (patch) | |
| tree | 47b2795e160b0f095840ded0bb7f4c7af237eb41 /include/linux | |
| parent | 684adca4f84365ca327e06dba696b62de7a79eca (diff) | |
| parent | 8909c9ad8ff03611c9c96c9a92656213e4bb495b (diff) | |
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, ...) | |||
| 2392 | extern int netdev_info(const struct net_device *dev, const char *format, ...) | 2392 | extern int netdev_info(const struct net_device *dev, const char *format, ...) |
| 2393 | __attribute__ ((format (printf, 2, 3))); | 2393 | __attribute__ ((format (printf, 2, 3))); |
| 2394 | 2394 | ||
| 2395 | #define MODULE_ALIAS_NETDEV(device) \ | ||
| 2396 | MODULE_ALIAS("netdev-" device) | ||
| 2397 | |||
| 2395 | #if defined(DEBUG) | 2398 | #if defined(DEBUG) |
| 2396 | #define netdev_dbg(__dev, format, args...) \ | 2399 | #define netdev_dbg(__dev, format, args...) \ |
| 2397 | netdev_printk(KERN_DEBUG, __dev, format, ##args) | 2400 | netdev_printk(KERN_DEBUG, __dev, format, ##args) |