diff options
| author |   Gal Pressman <gal@nvidia.com> | 2025-06-16 16:26:25 +0300 |
|---|---|---|
| committer |   Jakub Kicinski <kuba@kernel.org> | 2025-06-17 18:06:38 -0700 |
| commit | 60a8b1a5d0824afda869f18dc0ecfe72f8dfda42 (patch) | |
| tree | e1940a4202b1e3d3f09f038823bc08f2f847b119 | |
| parent | net: vlan: Make is_vlan_dev() a stub when VLAN is not configured (diff) | |
| download | wireguard-linux-60a8b1a5d0824afda869f18dc0ecfe72f8dfda42.tar.xz wireguard-linux-60a8b1a5d0824afda869f18dc0ecfe72f8dfda42.zip | |
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 <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-3-gal@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | include/linux/if_vlan.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 618a973ff8ee..b9f699799cf6 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; } |