diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-03-12 16:59:40 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-03-12 16:59:40 +0100 |
| commit | 8d99753ad93af6bcaf798232eeb15e60bdd7e94b (patch) | |
| tree | d1442504baf73be22d9e6bc1864206df5ccedfeb /drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |
| parent | 0e674a64b86e2bb00ab43f56104d3ea85dda0066 (diff) | |
| parent | b67416226a0cff3f49032de36906ad1ebe5694a0 (diff) | |
Merge tag 'v4.9.87' into fslc_4.9-1.0.x-imx
This is the 4.9.87 stable release
Conflicts:
drivers/dma/fsl-edma.c
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib_multicast.c')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index fddff403d5d2..6b6826f3e446 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c @@ -818,7 +818,10 @@ void ipoib_mcast_send(struct net_device *dev, u8 *daddr, struct sk_buff *skb) spin_lock_irqsave(&priv->lock, flags); if (!neigh) { neigh = ipoib_neigh_alloc(daddr, dev); - if (neigh) { + /* Make sure that the neigh will be added only + * once to mcast list. + */ + if (neigh && list_empty(&neigh->list)) { kref_get(&mcast->ah->ref); neigh->ah = mcast->ah; list_add_tail(&neigh->list, &mcast->neigh_list); |