From: Gal Pressman Date: Mon, 16 Jun 2025 13:26:26 +0000 (+0300) Subject: net: vlan: Use IS_ENABLED() helper for CONFIG_VLAN_8021Q guard X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9c5f5a5bf0da5cee2044b93907ac6d8d9af0492b;p=thirdparty%2Flinux.git net: vlan: Use IS_ENABLED() helper for CONFIG_VLAN_8021Q guard 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 Reviewed-by: Dragos Tatulea Signed-off-by: Gal Pressman Link: https://patch.msgid.link/20250616132626.1749331-4-gal@nvidia.com Signed-off-by: Jakub Kicinski --- diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index b9f699799cf6e..15e01935d3fad 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -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);