diff options
| author | Doug Ledford <dledford@redhat.com> | 2017-08-18 21:12:04 +0300 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-08-18 21:12:04 +0300 |
| commit | b0e32e20e3c63778d8c20a40d8bec8b18baffecb (patch) | |
| tree | 2e0c3311c53889473b94d49132fe5b7cdee71d51 /drivers/infiniband/ulp/ipoib/ipoib.h | |
| parent | d3cf4d9915c4fb60aeef580973aa77420e600746 (diff) | |
| parent | 870201f95fcbd19538aef630393fe9d583eff82e (diff) | |
| download | linux-b0e32e20e3c63778d8c20a40d8bec8b18baffecb.tar.xz | |
Merge branch 'k.o/for-4.13-rc' into k.o/for-next
Merging our (hopefully) final -rc pull branch into our for-next branch
because some of our pending patches won't apply cleanly without having
the -rc patches in our tree.
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib.h')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index 9e738104c2a1..16c1af1c706e 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h @@ -336,6 +336,7 @@ struct ipoib_dev_priv { unsigned long flags; struct rw_semaphore vlan_rwsem; + struct mutex mcast_mutex; struct rb_root path_tree; struct list_head path_list; |