diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/ipv4/igmp.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/ipv4/igmp.c')
| -rw-r--r-- | net/ipv4/igmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index db710b059bab..f10eab462282 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c | |||
| @@ -1321,7 +1321,7 @@ void ip_mc_inc_group(struct in_device *in_dev, __be32 addr) | |||
| 1321 | atomic_set(&im->refcnt, 1); | 1321 | atomic_set(&im->refcnt, 1); |
| 1322 | spin_lock_init(&im->lock); | 1322 | spin_lock_init(&im->lock); |
| 1323 | #ifdef CONFIG_IP_MULTICAST | 1323 | #ifdef CONFIG_IP_MULTICAST |
| 1324 | setup_timer(&im->timer, &igmp_timer_expire, (unsigned long)im); | 1324 | setup_timer(&im->timer, igmp_timer_expire, (unsigned long)im); |
| 1325 | im->unsolicit_count = IGMP_Unsolicited_Report_Count; | 1325 | im->unsolicit_count = IGMP_Unsolicited_Report_Count; |
| 1326 | #endif | 1326 | #endif |
| 1327 | 1327 | ||