Skip to content

Commit 8f08854

Browse files
zijun-hudavem330
authored andcommitted
net: sysfs: Fix weird usage of class's namespace relevant fields
Device class has two namespace relevant fields which are associated by the following usage: struct class { ... const struct kobj_ns_type_operations *ns_type; const void *(*namespace)(const struct device *dev); ... } if (dev->class && dev->class->ns_type) dev->class->namespace(dev); The usage looks weird since it checks @ns_type but calls namespace() it is found for all existing class definitions that the other filed is also assigned once one is assigned in current kernel tree, so fix this weird usage by checking @namespace to call namespace(). Signed-off-by: Zijun Hu <[email protected]> Reviewed-by: Simon Horman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 4897313 commit 8f08854

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/core/net-sysfs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1060,7 +1060,7 @@ static const void *rx_queue_namespace(const struct kobject *kobj)
10601060
struct device *dev = &queue->dev->dev;
10611061
const void *ns = NULL;
10621062

1063-
if (dev->class && dev->class->ns_type)
1063+
if (dev->class && dev->class->namespace)
10641064
ns = dev->class->namespace(dev);
10651065

10661066
return ns;
@@ -1744,7 +1744,7 @@ static const void *netdev_queue_namespace(const struct kobject *kobj)
17441744
struct device *dev = &queue->dev->dev;
17451745
const void *ns = NULL;
17461746

1747-
if (dev->class && dev->class->ns_type)
1747+
if (dev->class && dev->class->namespace)
17481748
ns = dev->class->namespace(dev);
17491749

17501750
return ns;

0 commit comments

Comments
 (0)