]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: vlan: Use IS_ENABLED() helper for CONFIG_VLAN_8021Q guard
authorGal Pressman <gal@nvidia.com>
Mon, 16 Jun 2025 13:26:26 +0000 (16:26 +0300)
committerJakub Kicinski <kuba@kernel.org>
Wed, 18 Jun 2025 01:06:39 +0000 (18:06 -0700)
The header currently tests the VLAN core with an explicit pair of 'if
defined' checks:
    #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)

Instead, use IS_ENABLED() which is the kernel way to test whether an
option is configured as builtin/module.

This is purely cosmetic – no functional changes.

Reviewed-by: Alex Lazar <alazar@nvidia.com>
Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: Gal Pressman <gal@nvidia.com>
Link: https://patch.msgid.link/20250616132626.1749331-4-gal@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
include/linux/if_vlan.h

index b9f699799cf6e9a5b3469e225167269a001555a0..15e01935d3fad2edd08c997c7ada7c71e6d13abf 100644 (file)
@@ -131,7 +131,7 @@ struct vlan_pcpu_stats {
        u32                     tx_dropped;
 };
 
-#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
+#if IS_ENABLED(CONFIG_VLAN_8021Q)
 
 extern struct net_device *__vlan_find_dev_deep_rcu(struct net_device *real_dev,
                                               __be16 vlan_proto, u16 vlan_id);