Skip to contentSkip to conversation

net: vlan: two small refactors to make code more concise

PATCH In review Ziyang Xuan 2 participants 5 messages Aug 31, 2022 – Sep 2, 2022

Subsystems (2)
lore
Share & tools
lore
#2 lore raw

PATCH 2/2 net: vlan: reduce indentation level in __vlan_find_dev_deep_rcu()

In reply to Ziyang Xuan

If vlan_info is NULL in __vlan_find_dev_deep_rcu(), else { ... } is unnecessary. Remove it to reduce indentation level.

---
 net/8021q/vlan_core.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)
net/8021q/vlan_core.c +9 -13
index 5aa8144101dc..027d4ebed9c0 100644
@@ -77,23 +77,19 @@ struct net_device *__vlan_find_dev_deep_rcu(struct net_device *dev,
 					__be16 vlan_proto, u16 vlan_id)
 {
 	struct vlan_info *vlan_info = rcu_dereference(dev->vlan_info);
+	struct net_device *upper_dev;
 
-	if (vlan_info) {
+	if (vlan_info)
 		return vlan_group_get_device(&vlan_info->grp,
 					     vlan_proto, vlan_id);
-	} else {
-		/*
-		 * Lower devices of master uppers (bonding, team) do not have
-		 * grp assigned to themselves. Grp is assigned to upper device
-		 * instead.
-		 */
-		struct net_device *upper_dev;
 
-		upper_dev = netdev_master_upper_dev_get_rcu(dev);
-		if (upper_dev)
-			return __vlan_find_dev_deep_rcu(upper_dev,
-						    vlan_proto, vlan_id);
-	}
+	/* Lower devices of master uppers (bonding, team) do not have
+	 * grp assigned to themselves. Grp is assigned to upper device
+	 * instead.
+	 */
+	upper_dev = netdev_master_upper_dev_get_rcu(dev);
+	if (upper_dev)
+		return __vlan_find_dev_deep_rcu(upper_dev, vlan_proto, vlan_id);
 
 	return NULL;
 }
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/2 net: vlan: remove unnecessary err variable in vlan_init_net()

In reply to Ziyang Xuan

Return vlan_init_net() directly in vlan_init_net(), remove unnecessary err variable. Thus code looks more concise.

---
 net/8021q/vlan.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
net/8021q/vlan.c +1 -4
index e40aa3e3641c..aaef80fdd852 100644
@@ -658,13 +658,10 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
 static int __net_init vlan_init_net(struct net *net)
 {
 	struct vlan_net *vn = net_generic(net, vlan_net_id);
-	int err;
 
 	vn->name_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD;
 
-	err = vlan_proc_init(net);
-
-	return err;
+	return vlan_proc_init(net);
 }
 
 static void __net_exit vlan_exit_net(struct net *net)
Signature · 1 line
2.25.1
#0 lore raw

cover net: vlan: two small refactors to make code more concise

Give two small refactors to make code more concise.

Ziyang Xuan (2):
net: vlan: remove unnecessary err variable in vlan_init_net()
net: vlan: reduce indentation level in __vlan_find_dev_deep_rcu()

 net/8021q/vlan.c      |  5 +----
 net/8021q/vlan_core.c | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 17 deletions(-)
Signature · 1 line
2.25.1
maintainer
#3 lore raw

Hello,

Quoted 9 lines · Ziyang Xuan

Give two small refactors to make code more concise.

Ziyang Xuan (2):
net: vlan: remove unnecessary err variable in vlan_init_net()
net: vlan: reduce indentation level in __vlan_find_dev_deep_rcu()

 net/8021q/vlan.c      |  5 +----
 net/8021q/vlan_core.c | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 17 deletions(-)

The patches look correct to me, but I think is better to defer this kind of nun-functional refactors to some work actually doing new stuff, to avoid unneeded noise.

Note that I merged a few other clean-up recently, but e.g. they at least formally removed some unneeded branch.

Sorry, I'm not going to apply this series.

Cheers,

Paolo

#4 lore raw
Quoted 13 lines · Paolo Abeni

Hello,

Quoted 9 lines · Ziyang Xuan

Give two small refactors to make code more concise.

Ziyang Xuan (2):
net: vlan: remove unnecessary err variable in vlan_init_net()
net: vlan: reduce indentation level in __vlan_find_dev_deep_rcu()

 net/8021q/vlan.c      |  5 +----
 net/8021q/vlan_core.c | 22 +++++++++-------------
 2 files changed, 10 insertions(+), 17 deletions(-)
Quoted 8 lines

The patches look correct to me, but I think is better to defer this kind of nun-functional refactors to some work actually doing new stuff, to avoid unneeded noise.

Note that I merged a few other clean-up recently, but e.g. they at least formally removed some unneeded branch.

Sorry, I'm not going to apply this series.

No problem, I will try to dig deeper.

Quoted 7 lines

Cheers,

Paolo

.