VLAN_TRUNKDEV() requires epochification in ibcore after r353292.
Sponsored by: Mellanox Technologies
This commit is contained in:
parent
052bc06c25
commit
758a35d0bc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=353633
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user