From 8232fd4dcd458c7114521b00284abdc637e8463b Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Wed, 16 Oct 2019 08:40:58 +0000 Subject: [PATCH] VLAN_DEVAT() requires epochification in ipoib after r353292. Sponsored by: Mellanox Technologies --- sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c index 99c46b581fc2..ed5ad1f5fad2 100644 --- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c @@ -1315,13 +1315,16 @@ ipoib_config_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag) { struct ipoib_dev_priv *parent; struct ipoib_dev_priv *priv; + struct epoch_tracker et; struct ifnet *dev; uint16_t pkey; int error; if (ifp->if_type != IFT_INFINIBAND) return; + NET_EPOCH_ENTER(et); dev = VLAN_DEVAT(ifp, vtag); + NET_EPOCH_EXIT(et); if (dev == NULL) return; priv = NULL; @@ -1383,13 +1386,16 @@ ipoib_unconfig_vlan(void *arg, struct ifnet *ifp, u_int16_t vtag) { struct ipoib_dev_priv *parent; struct ipoib_dev_priv *priv; + struct epoch_tracker et; struct ifnet *dev; uint16_t pkey; if (ifp->if_type != IFT_INFINIBAND) return; + NET_EPOCH_ENTER(et); dev = VLAN_DEVAT(ifp, vtag); + NET_EPOCH_EXIT(et); if (dev) VLAN_SETCOOKIE(dev, NULL); pkey = vtag | 0x8000;