Merge remote-tracking branch 'driver-core/driver-core-next'

[karo-tx-linux.git] / include / linux / netdevice.h

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index c893f2295f496ffb7785b24ad27f4123e41251cb..809afccf7a60b11e3807ec485b4ea9d7b633d73a 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2894,8 +2894,20 @@ int __init dev_proc_init(void);
 #define dev_proc_init() 0
 #endif
 
-int netdev_class_create_file(struct class_attribute *class_attr);
-void netdev_class_remove_file(struct class_attribute *class_attr);
+int netdev_class_create_file_ns(struct class_attribute *class_attr,
+                               const void *ns);
+void netdev_class_remove_file_ns(struct class_attribute *class_attr,
+                                const void *ns);
+
+static inline int netdev_class_create_file(struct class_attribute *class_attr)
+{
+       return netdev_class_create_file_ns(class_attr, NULL);
+}
+
+static inline void netdev_class_remove_file(struct class_attribute *class_attr)
+{
+       netdev_class_remove_file_ns(class_attr, NULL);
+}
 
 extern struct kobj_ns_type_operations net_ns_type_operations;