diff options
| author | Ido Schimmel <idosch@mellanox.com> | 2017-09-03 17:44:13 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-09-05 11:51:47 -0700 |
| commit | f1c2eddf4cb6a6c8ca5f6e728e7328b9c5bc3e8a (patch) | |
| tree | 947890deec185d704d29459ed6511eb302bac33d /net/bridge | |
| parent | 691223ec9798a617cb372470f4bf37e312d15063 (diff) | |
| download | linux-f1c2eddf4cb6a6c8ca5f6e728e7328b9c5bc3e8a.tar.gz linux-f1c2eddf4cb6a6c8ca5f6e728e7328b9c5bc3e8a.tar.bz2 linux-f1c2eddf4cb6a6c8ca5f6e728e7328b9c5bc3e8a.zip | |
bridge: switchdev: Use an helper to clear forward mark
Instead of using ifdef in the C file.
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Suggested-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Tested-by: Yotam Gigi <yotamg@mellanox.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_device.c | 4 | ||||
| -rw-r--r-- | net/bridge/br_private.h | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 5a7be3bddfa9..f6b6a92f1c48 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -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); diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index fd9ee73e0a6d..e870cfc85b14 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -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 |