| Message ID | e68a18f6bfeeb5d05c1506da65f308e8e3d29013.1661916732.git.william.xuanziyang@huawei.com (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: vlan: two small refactors to make code more concise | expand |
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index e40aa3e3641c..aaef80fdd852 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -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)
Return vlan_init_net() directly in vlan_init_net(), remove unnecessary err variable. Thus code looks more concise. Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com> --- net/8021q/vlan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)