diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-24 19:21:58 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-24 19:21:58 -0700 |
| commit | 19725496da5602b401eae389736ab00d1817e264 (patch) | |
| tree | 4c1a94bf0121769110f1b9c08ee337a55679a48a /net/ipv4/igmp.c | |
| parent | aea5f654e6b78a0c976f7a25950155932c77a53f (diff) | |
| parent | 9981b4fb8684883dcc0daf088891ff32260b9794 (diff) | |
| download | linux-stable-19725496da5602b401eae389736ab00d1817e264.tar.gz linux-stable-19725496da5602b401eae389736ab00d1817e264.tar.bz2 linux-stable-19725496da5602b401eae389736ab00d1817e264.zip | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4/igmp.c')
| -rw-r--r-- | net/ipv4/igmp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index 598333b123b9..bae9096821be 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -1200,8 +1200,7 @@ static void igmpv3_del_delrec(struct in_device *in_dev, struct ip_mc_list *im) spin_lock_bh(&im->lock); if (pmc) { im->interface = pmc->interface; - im->sfmode = pmc->sfmode; - if (pmc->sfmode == MCAST_INCLUDE) { + if (im->sfmode == MCAST_INCLUDE) { im->tomb = pmc->tomb; im->sources = pmc->sources; for (psf = im->sources; psf; psf = psf->sf_next) |