diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2019-10-15 11:12:31 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2019-10-15 11:12:31 +0000 |
| commit | 06656d75b172c1be5a108331f6d61f2e4ccda012 (patch) | |
| tree | 54b5e999af162249c76a165c5fd8891ac611fcf9 | |
| parent | f570a1bd0939bbe5b89df53b64f540d4ede8bd2d (diff) | |
| download | src-06656d75b172c1be5a108331f6d61f2e4ccda012.tar.gz src-06656d75b172c1be5a108331f6d61f2e4ccda012.zip | |
Fix missing epochification of the ibcore code after r353292.
Sponsored by: Mellanox Technologies
Notes
Notes:
svn path=/head/; revision=353547
| -rw-r--r-- | sys/ofed/drivers/infiniband/core/ib_addr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/ofed/drivers/infiniband/core/ib_addr.c b/sys/ofed/drivers/infiniband/core/ib_addr.c index a56219ae48a0..09606968c2b5 100644 --- a/sys/ofed/drivers/infiniband/core/ib_addr.c +++ b/sys/ofed/drivers/infiniband/core/ib_addr.c @@ -3,7 +3,7 @@ * * Copyright (c) 2005 Voltaire Inc. All rights reserved. * Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved. - * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved. + * Copyright (c) 1999-2019, Mellanox Technologies, Inc. All rights reserved. * Copyright (c) 2005 Intel Corporation. All rights reserved. * * This software is available to you under a choice of one of two @@ -676,6 +676,7 @@ static int addr_resolve(struct sockaddr *src_in, const struct sockaddr *dst_in, struct rdma_dev_addr *addr) { + struct epoch_tracker et; struct net_device *ndev = NULL; u8 edst[MAX_ADDR_LEN]; int ret; @@ -683,6 +684,7 @@ static int addr_resolve(struct sockaddr *src_in, if (dst_in->sa_family != src_in->sa_family) return -EINVAL; + NET_EPOCH_ENTER(et); switch (src_in->sa_family) { case AF_INET: ret = addr4_resolve((struct sockaddr_in *)src_in, @@ -698,6 +700,7 @@ static int addr_resolve(struct sockaddr *src_in, ret = -EADDRNOTAVAIL; break; } + NET_EPOCH_EXIT(et); /* check for error */ if (ret != 0) |