diff options
| -rw-r--r-- | net/bridge/br_multicast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index fdbd41c76ec4..c558274051eb 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c | |||
| @@ -1178,7 +1178,7 @@ static int br_ip4_multicast_query(struct net_bridge *br, | |||
| 1178 | if (timer_pending(&p->timer) ? | 1178 | if (timer_pending(&p->timer) ? |
| 1179 | time_after(p->timer.expires, now + max_delay) : | 1179 | time_after(p->timer.expires, now + max_delay) : |
| 1180 | try_to_del_timer_sync(&p->timer) >= 0) | 1180 | try_to_del_timer_sync(&p->timer) >= 0) |
| 1181 | mod_timer(&mp->timer, now + max_delay); | 1181 | mod_timer(&p->timer, now + max_delay); |
| 1182 | } | 1182 | } |
| 1183 | 1183 | ||
| 1184 | out: | 1184 | out: |
| @@ -1249,7 +1249,7 @@ static int br_ip6_multicast_query(struct net_bridge *br, | |||
| 1249 | if (timer_pending(&p->timer) ? | 1249 | if (timer_pending(&p->timer) ? |
| 1250 | time_after(p->timer.expires, now + max_delay) : | 1250 | time_after(p->timer.expires, now + max_delay) : |
| 1251 | try_to_del_timer_sync(&p->timer) >= 0) | 1251 | try_to_del_timer_sync(&p->timer) >= 0) |
| 1252 | mod_timer(&mp->timer, now + max_delay); | 1252 | mod_timer(&p->timer, now + max_delay); |
| 1253 | } | 1253 | } |
| 1254 | 1254 | ||
| 1255 | out: | 1255 | out: |