diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-24 22:21:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-24 22:21:58 -0400 |
| commit | 19725496da5602b401eae389736ab00d1817e264 (patch) | |
| tree | 4c1a94bf0121769110f1b9c08ee337a55679a48a /net/ipv6/mcast.c | |
| parent | aea5f654e6b78a0c976f7a25950155932c77a53f (diff) | |
| parent | 9981b4fb8684883dcc0daf088891ff32260b9794 (diff) | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/mcast.c')
| -rw-r--r-- | net/ipv6/mcast.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 195ed2db2207..4ae54aaca373 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c | |||
| @@ -790,8 +790,7 @@ static void mld_del_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im) | |||
| 790 | spin_lock_bh(&im->mca_lock); | 790 | spin_lock_bh(&im->mca_lock); |
| 791 | if (pmc) { | 791 | if (pmc) { |
| 792 | im->idev = pmc->idev; | 792 | im->idev = pmc->idev; |
| 793 | im->mca_sfmode = pmc->mca_sfmode; | 793 | if (im->mca_sfmode == MCAST_INCLUDE) { |
| 794 | if (pmc->mca_sfmode == MCAST_INCLUDE) { | ||
| 795 | im->mca_tomb = pmc->mca_tomb; | 794 | im->mca_tomb = pmc->mca_tomb; |
| 796 | im->mca_sources = pmc->mca_sources; | 795 | im->mca_sources = pmc->mca_sources; |
| 797 | for (psf = im->mca_sources; psf; psf = psf->sf_next) | 796 | for (psf = im->mca_sources; psf; psf = psf->sf_next) |