VLAN_TRUNKDEV() requires epochification in ibcore after r353292.

Sponsored by: Mellanox Technologies
kstardust · Oct 16, 2019 · 12434b0 · 12434b0
1 parent ae1053f
commit 12434b0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/sys/ofed/include/rdma/ib_addr.h b/sys/ofed/include/rdma/ib_addr.h
@@ -354,9 +354,13 @@ static inline u16 rdma_get_vlan_id(union ib_gid *dgid)
 
 static inline struct net_device *rdma_vlan_dev_real_dev(struct net_device *dev)
 {
-	if (dev->if_type == IFT_ETHER && dev->if_pcp != IFNET_PCP_NONE)
-		return dev; /* prio-tagged traffic */
-	return VLAN_TRUNKDEV(__DECONST(struct ifnet *, dev));
+	struct epoch_tracker et;
+
+	NET_EPOCH_ENTER(et);
+	if (dev->if_type != IFT_ETHER || dev->if_pcp == IFNET_PCP_NONE)
+		dev = VLAN_TRUNKDEV(dev);	/* non prio-tagged traffic */
+	NET_EPOCH_EXIT(et);
+	return (dev);
 }
 
 #endif /* IB_ADDR_H */