From 61c300f92c17d00a0a7cec282eac0e949195afc6 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 23 Nov 2021 12:43:52 -0500 Subject: [PATCH] net: bridge: make the orig_iface info available The per-packet orig_iface information is available when CONFIG_NET_ROUTING is set. It is pretty useful to have it available with CONFIG_NET_ETHERNET_BRIDGE as well. Signed-off-by: Nicolas Pitre --- include/net/net_pkt.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/net/net_pkt.h b/include/net/net_pkt.h index 9695320c87e..50b6106077e 100644 --- a/include/net/net_pkt.h +++ b/include/net/net_pkt.h @@ -86,7 +86,7 @@ struct net_pkt { /** @cond ignore */ -#if defined(CONFIG_NET_ROUTING) +#if defined(CONFIG_NET_ROUTING) || defined(CONFIG_NET_ETHERNET_BRIDGE) struct net_if *orig_iface; /* Original network interface */ #endif @@ -311,7 +311,7 @@ static inline void net_pkt_set_iface(struct net_pkt *pkt, struct net_if *iface) static inline struct net_if *net_pkt_orig_iface(struct net_pkt *pkt) { -#if defined(CONFIG_NET_ROUTING) +#if defined(CONFIG_NET_ROUTING) || defined(CONFIG_NET_ETHERNET_BRIDGE) return pkt->orig_iface; #else return pkt->iface; @@ -321,7 +321,7 @@ static inline struct net_if *net_pkt_orig_iface(struct net_pkt *pkt) static inline void net_pkt_set_orig_iface(struct net_pkt *pkt, struct net_if *iface) { -#if defined(CONFIG_NET_ROUTING) +#if defined(CONFIG_NET_ROUTING) || defined(CONFIG_NET_ETHERNET_BRIDGE) pkt->orig_iface = iface; #endif }