diff options
-rw-r--r-- | net/bridge/br_forward.c | 2 | ||||
-rw-r--r-- | net/bridge/br_private.h | 6 | ||||
-rw-r--r-- | net/bridge/br_switchdev.c | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c index bc14b1b384e9..ec646656dbf1 100644 --- a/net/bridge/br_forward.c +++ b/net/bridge/br_forward.c @@ -48,7 +48,7 @@ int br_dev_queue_push_xmit(struct net *net, struct sock *sk, struct sk_buff *skb skb_set_network_header(skb, depth); } - skb->offload_fwd_mark = br_switchdev_frame_uses_tx_fwd_offload(skb); + br_switchdev_frame_set_offload_fwd_mark(skb); dev_queue_xmit(skb); diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 86ca617fec7a..1c57877270f7 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -1881,6 +1881,8 @@ static inline void br_sysfs_delbr(struct net_device *dev) { return; } #ifdef CONFIG_NET_SWITCHDEV bool br_switchdev_frame_uses_tx_fwd_offload(struct sk_buff *skb); +void br_switchdev_frame_set_offload_fwd_mark(struct sk_buff *skb); + void nbp_switchdev_frame_mark_tx_fwd_offload(const struct net_bridge_port *p, struct sk_buff *skb); void nbp_switchdev_frame_mark_tx_fwd_to_hwdom(const struct net_bridge_port *p, @@ -1910,6 +1912,10 @@ static inline bool br_switchdev_frame_uses_tx_fwd_offload(struct sk_buff *skb) return false; } +static inline void br_switchdev_frame_set_offload_fwd_mark(struct sk_buff *skb) +{ +} + static inline void nbp_switchdev_frame_mark_tx_fwd_offload(const struct net_bridge_port *p, struct sk_buff *skb) diff --git a/net/bridge/br_switchdev.c b/net/bridge/br_switchdev.c index 96ce069d0c8c..9cf9ab320c48 100644 --- a/net/bridge/br_switchdev.c +++ b/net/bridge/br_switchdev.c @@ -28,6 +28,11 @@ bool br_switchdev_frame_uses_tx_fwd_offload(struct sk_buff *skb) return BR_INPUT_SKB_CB(skb)->tx_fwd_offload; } +void br_switchdev_frame_set_offload_fwd_mark(struct sk_buff *skb) +{ + skb->offload_fwd_mark = br_switchdev_frame_uses_tx_fwd_offload(skb); +} + /* Mark the frame for TX forwarding offload if this egress port supports it */ void nbp_switchdev_frame_mark_tx_fwd_offload(const struct net_bridge_port *p, struct sk_buff *skb) |