Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1c2eddf authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

bridge: switchdev: Use an helper to clear forward mark 



Instead of using ifdef in the C file.

Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Suggested-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Tested-by: default avatarYotam Gigi <yotamg@mellanox.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 691223ec

net/bridge/br_device.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

net/bridge/br_private.h

+9 −0
Original line number Diff line number Diff line
@@ -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