diff options
| author | Hangbin Liu <liuhangbin@gmail.com> | 2018-08-29 12:06:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-02 22:39:37 +0200 |
| commit | 4fb7253e4f9a8f06a986a3b317e2f79d9b43d552 (patch) | |
| tree | 58b3ac21e9702ba129cc231fda80830ccdead06c /net/ipv4/igmp.c | |
| parent | ipv6: don't get lwtstate twice in ip6_rt_copy_init() (diff) | |
| download | linux-4fb7253e4f9a8f06a986a3b317e2f79d9b43d552.tar.xz linux-4fb7253e4f9a8f06a986a3b317e2f79d9b43d552.zip | |
igmp: fix incorrect unsolicit report count when join group
We should not start timer if im->unsolicit_count equal to 0 after decrease.
Or we will send one more unsolicit report message. i.e. 3 instead of 2 by
default.
Fixes: 1da177e4c3f41 ("Linux-2.6.12-rc2")
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/igmp.c')
| -rw-r--r-- | net/ipv4/igmp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index cf75f8944b05..deb1f8274d71 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -820,10 +820,9 @@ static void igmp_timer_expire(struct timer_list *t) spin_lock(&im->lock); im->tm_running = 0; - if (im->unsolicit_count) { - im->unsolicit_count--; + if (im->unsolicit_count && --im->unsolicit_count) igmp_start_timer(im, unsolicited_report_interval(in_dev)); - } + im->reporter = 1; spin_unlock(&im->lock); |