Commit 8f088541 authored by Zijun Hu's avatar Zijun Hu Committed by David S. Miller
Browse files

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: default avatarZijun Hu <quic_zijuhu@quicinc.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4897313b

net/core/net-sysfs.c

+2 −2
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ static const void *rx_queue_namespace(const struct kobject *kobj) 
	struct device *dev = &queue->dev->dev;

	const void *ns = NULL;



	if (dev->class && dev->class->ns_type)

	if (dev->class && dev->class->namespace)

		ns = dev->class->namespace(dev);



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

	const void *ns = NULL;



	if (dev->class && dev->class->ns_type)

	if (dev->class && dev->class->namespace)

		ns = dev->class->namespace(dev);



	return ns;