---

yaml --- r: 193647 b: refs/heads/master c: e880eb6 h: refs/heads/master i: 193645: 641a1bf 193643: 15d5994 193639: a3e1e9b 193631: 1f276e2 v: v3
git-mirror · Mar 23, 2010 · 05832bd · 05832bd
1 parent 87196da
commit 05832bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70f60a220b33832ae4e2622b913f138892b6fe7b
+refs/heads/master: e880eb6c5c9d98e389ffc0d8947f75d70785361a
diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c
@@ -739,7 +739,9 @@ void netdev_unregister_kobject(struct net_device * net)
 	if (!net_eq(dev_net(net), &init_net))
 		return;
 
+#ifdef CONFIG_SYSFS
 	rx_queue_remove_kobjects(net);
+#endif
 
 	device_del(dev);
 }
@@ -780,11 +782,13 @@ int netdev_register_kobject(struct net_device *net)
 	if (error)
 		return error;
 
+#ifdef CONFIG_SYSFS
 	error = rx_queue_register_kobjects(net);
 	if (error) {
 		device_del(dev);
 		return error;
 	}
+#endif
 
 	return error;
 }