From 5e62b4bc6c7bd7c6929b3fe540fb1ba8744fd16c Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 9 Dec 2022 14:40:54 +0000 Subject: [vlan] Allow external code to identify VLAN priority as well as tag Signed-off-by: Michael Brown --- src/net/netdevice.c | 4 ++-- src/net/vlan.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/net') diff --git a/src/net/netdevice.c b/src/net/netdevice.c index 5df306e8d..51d1831cc 100644 --- a/src/net/netdevice.c +++ b/src/net/netdevice.c @@ -1171,12 +1171,12 @@ static void net_step ( struct process *process __unused ) { } /** - * Get the VLAN tag (when VLAN support is not present) + * Get the VLAN tag control information (when VLAN support is not present) * * @v netdev Network device * @ret tag 0, indicating that device is not a VLAN device */ -__weak unsigned int vlan_tag ( struct net_device *netdev __unused ) { +__weak unsigned int vlan_tci ( struct net_device *netdev __unused ) { return 0; } diff --git a/src/net/vlan.c b/src/net/vlan.c index 90f2934de..fe4488614 100644 --- a/src/net/vlan.c +++ b/src/net/vlan.c @@ -288,17 +288,17 @@ struct net_protocol vlan_protocol __net_protocol = { }; /** - * Get the VLAN tag + * Get the VLAN tag control information * * @v netdev Network device - * @ret tag VLAN tag, or 0 if device is not a VLAN device + * @ret tci VLAN tag control information, or 0 if not a VLAN device */ -unsigned int vlan_tag ( struct net_device *netdev ) { +unsigned int vlan_tci ( struct net_device *netdev ) { struct vlan_device *vlan; if ( netdev->op == &vlan_operations ) { vlan = netdev->priv; - return vlan->tag; + return ( VLAN_TCI ( vlan->tag, vlan->priority ) ); } else { return 0; } -- cgit v1.2.3-55-g7522