diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-08-02 10:59:20 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-08-02 10:59:20 +0300 |
| commit | 16e0e6a83b778284ae9b3a57003eeea8d8090b55 (patch) | |
| tree | 42bf9a711c59549294b2f2125978f5a7095e16c2 /net/ipv4/igmp.c | |
| parent | 25a00ac7dc92912f0b1e5e533bf077255c828b02 (diff) | |
| parent | ce03b6d2b610b70bb527d14d82c2394adb235e5d (diff) | |
| download | linux-16e0e6a83b778284ae9b3a57003eeea8d8090b55.tar.xz | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 b3c899a630a0..28fef7d15959 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) |