Browse Source

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>
Ido Schimmel 8 years ago
parent
commit
f1c2eddf4c
2 changed files with 10 additions and 3 deletions
  1. 1 3
      net/bridge/br_device.c
  2. 9 0
      net/bridge/br_private.h

+ 1 - 3
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;
 	brstats->tx_bytes += skb->len;
 	u64_stats_update_end(&brstats->syncp);
 	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;
 	BR_INPUT_SKB_CB(skb)->brdev = dev;
 
 
 	skb_reset_mac_header(skb);
 	skb_reset_mac_header(skb);

+ 9 - 0
net/bridge/br_private.h

@@ -1091,6 +1091,11 @@ int br_switchdev_set_port_flag(struct net_bridge_port *p,
 			       unsigned long mask);
 			       unsigned long mask);
 void br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb,
 void br_switchdev_fdb_notify(const struct net_bridge_fdb_entry *fdb,
 			     int type);
 			     int type);
+
+static inline void br_switchdev_frame_unmark(struct sk_buff *skb)
+{
+	skb->offload_fwd_mark = 0;
+}
 #else
 #else
 static inline int nbp_switchdev_mark_set(struct net_bridge_port *p)
 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)
 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 /* CONFIG_NET_SWITCHDEV */
 
 
 #endif
 #endif