From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86B7725D8E8; Tue, 11 Mar 2025 15:13:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741706010; cv=none; b=Wotr+IqSeWjbz4uT5II7StjX/uru3nkpmJxW/BVfEqLqeUoY9spe3QTE7ovK9bB/GuHT6ZNTN3uodvgHS630FesaSkmE6iOyapsexJ5giLGBKzuCkgdDtBDrGzZ++J23NPq7ExNPxiZjvqiBxQM0VAE0D+dR128nZ+eebVA6sek= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741706010; c=relaxed/simple; bh=sUGdPxgltr5TBE3f0r66OGpugelg7q7Bjjj5EsaebNA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BibIH1xYHyE/tqS1pS9kb5ZqiJNzPkXM/K+yiquVNXeIQUYe9rHi8XX3PPEX4em8llQc+zdRy9Bhh5OaHWeG+3J41k3EG5GkKE61U8OdgKcm9SeWZwODBnnYYUWuwkLKXIGuWrFBRyZKu1qLsGP10qHDQur0USQNLFxOe29U9rw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=q869nb95; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="q869nb95" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FBFBC4CEE9; Tue, 11 Mar 2025 15:13:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741706010; bh=sUGdPxgltr5TBE3f0r66OGpugelg7q7Bjjj5EsaebNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q869nb95CieHzv4uxM7kQ8P6ONR1lhTN+Tcgwb6bPDipGCF3MnygLql3LLZckRJbp g1q2nVoIK0BLk3yIqK+G9ljHU8Y+4Xzt5efAOunb8P1WlJ+F147tW2dIRU+XdANaJm 6mSB/5U0Mo2f95S6eOc9Sa0izsgxXNOY56G75cM0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xin Long , "David S. Miller" , Olivier Matz , Ivan Delalande Subject: [PATCH 5.4 224/328] vlan: introduce vlan_dev_free_egress_priority Date: Tue, 11 Mar 2025 15:59:54 +0100 Message-ID: <20250311145723.816843990@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311145714.865727435@linuxfoundation.org> References: <20250311145714.865727435@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xin Long commit 37aa50c539bcbcc01767e515bd170787fcfc0f33 upstream. This patch is to introduce vlan_dev_free_egress_priority() to free egress priority for vlan dev, and keep vlan_dev_uninit() static as .ndo_uninit. It makes the code more clear and safer when adding new code in vlan_dev_uninit() in the future. Signed-off-by: Xin Long Signed-off-by: David S. Miller Signed-off-by: Olivier Matz Signed-off-by: Ivan Delalande Signed-off-by: Greg Kroah-Hartman --- net/8021q/vlan.h | 2 +- net/8021q/vlan_dev.c | 7 ++++++- net/8021q/vlan_netlink.c | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-) --- a/net/8021q/vlan.h +++ b/net/8021q/vlan.h @@ -117,6 +117,7 @@ void vlan_dev_set_ingress_priority(const u32 skb_prio, u16 vlan_prio); int vlan_dev_set_egress_priority(const struct net_device *dev, u32 skb_prio, u16 vlan_prio); +void vlan_dev_free_egress_priority(const struct net_device *dev); int vlan_dev_change_flags(const struct net_device *dev, u32 flag, u32 mask); void vlan_dev_get_realdev_name(const struct net_device *dev, char *result); @@ -126,7 +127,6 @@ int vlan_check_real_dev(struct net_devic void vlan_setup(struct net_device *dev); int register_vlan_dev(struct net_device *dev, struct netlink_ext_ack *extack); void unregister_vlan_dev(struct net_device *dev, struct list_head *head); -void vlan_dev_uninit(struct net_device *dev); bool vlan_dev_inherit_address(struct net_device *dev, struct net_device *real_dev); --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -590,7 +590,7 @@ static int vlan_dev_init(struct net_devi } /* Note: this function might be called multiple times for the same device. */ -void vlan_dev_uninit(struct net_device *dev) +void vlan_dev_free_egress_priority(const struct net_device *dev) { struct vlan_priority_tci_mapping *pm; struct vlan_dev_priv *vlan = vlan_dev_priv(dev); @@ -604,6 +604,11 @@ void vlan_dev_uninit(struct net_device * } } +static void vlan_dev_uninit(struct net_device *dev) +{ + vlan_dev_free_egress_priority(dev); +} + static netdev_features_t vlan_dev_fix_features(struct net_device *dev, netdev_features_t features) { --- a/net/8021q/vlan_netlink.c +++ b/net/8021q/vlan_netlink.c @@ -187,10 +187,11 @@ static int vlan_newlink(struct net *src_ return -EINVAL; err = vlan_changelink(dev, tb, data, extack); - if (!err) - err = register_vlan_dev(dev, extack); if (err) - vlan_dev_uninit(dev); + return err; + err = register_vlan_dev(dev, extack); + if (err) + vlan_dev_free_egress_priority(dev); return err; }