From: Gal Pressman Date: Mon, 16 Jun 2025 13:26:25 +0000 (+0300) Subject: net: vlan: Replace BUG() with WARN_ON_ONCE() in vlan_dev_* stubs X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60a8b1a5d0824afda869f18dc0ecfe72f8dfda42;p=thirdparty%2Flinux.git net: vlan: Replace BUG() with WARN_ON_ONCE() in vlan_dev_* stubs When CONFIG_VLAN_8021Q=n, a set of stub helpers are used, three of these helpers use BUG() unconditionally. This code should not be reached, as callers of these functions should always check for is_vlan_dev() first, but the usage of BUG() is not recommended, replace it with WARN_ON() instead. Reviewed-by: Alex Lazar Reviewed-by: Dragos Tatulea Signed-off-by: Gal Pressman Link: https://patch.msgid.link/20250616132626.1749331-3-gal@nvidia.com Signed-off-by: Jakub Kicinski --- diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 618a973ff8ee1..b9f699799cf6e 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -259,19 +259,19 @@ vlan_for_each(struct net_device *dev, static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev) { - BUG(); + WARN_ON_ONCE(1); return NULL; } static inline u16 vlan_dev_vlan_id(const struct net_device *dev) { - BUG(); + WARN_ON_ONCE(1); return 0; } static inline __be16 vlan_dev_vlan_proto(const struct net_device *dev) { - BUG(); + WARN_ON_ONCE(1); return 0; }