diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 23:50:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-08-14 23:50:58 +0200 |
| commit | feea468014f0c2f930b149e83a9047da86b26e4e (patch) | |
| tree | 29807205f471d63affd20e1e36fc3f832b55a106 /drivers/infiniband/ulp/ipoib/ipoib.h | |
| parent | MAINTAINERS: add entry for mediatek usb3 DRD IP driver (diff) | |
| parent | Linux 4.13-rc5 (diff) | |
| download | linux-feea468014f0c2f930b149e83a9047da86b26e4e.tar.xz linux-feea468014f0c2f930b149e83a9047da86b26e4e.zip | |
Merge 4.13-rc5 into usb-next
This gets the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 ff50a7bd66d8..7ac25059c40f 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; |