mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-11-07 10:01:00 +01:00
bridge: switchdev: Use an helper to clear forward mark
Instead of using ifdef in the C file. Signed-off-by: Ido Schimmel <[email protected]> Suggested-by: Nikolay Aleksandrov <[email protected]> Tested-by: Yotam Gigi <[email protected]> Acked-by: Nikolay Aleksandrov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
1 parent
691223ec97
commit
f1c2eddf4c
2 files changed
+10
-3
No files matched your search
@@ -53,9 +53,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
brstats->tx_bytes += skb->len;
|
||||
u64_stats_update_end(&brstats->syncp);
|
||||
|
||||
#ifdef CONFIG_NET_SWITCHDEV
|
||||
skb->offload_fwd_mark = 0;
|
||||
#endif
|
||||
br_switchdev_frame_unmark(skb);
|
||||
BR_INPUT_SKB_CB(skb)->brdev = dev;
|
||||
|
||||
skb_reset_mac_header(skb);
|
||||
|
||||
@@ -1091,6 +1091,11 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p,
|
||||
unsigned long mask);
|
||||
void br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb,
|
||||
int type);
|
||||
|
||||
static inline void br_switchdev_frame_unmark(struct sk_buff *skb)
|
||||
{
|
||||
skb->offload_fwd_mark = 0;
|
||||
}
|
||||
#else
|
||||
static inline int nbp_switchdev_mark_set(struct net_bridge_port *p)
|
||||
{
|
||||
@@ -1119,6 +1124,10 @@ static inline void
|
||||
br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb, int type)
|
||||
{
|
||||
}
|
||||
|
||||
static inline void br_switchdev_frame_unmark(struct sk_buff *skb)
|
||||
{
|
||||
}
|
||||
#endif /* CONFIG_NET_SWITCHDEV */
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user