forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Revert "net: igmp: increase size of mr_ifc_count"

Browse source 
This reverts commit 4344440d91 which is
commit b69dd5b378 upstream.

This breaks the kernel abi and is not an issue for Android systems.

Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1006e8d8ca58cf07ea23404e386ba58651424eb2
This commit is contained in:
Greg Kroah-Hartman 2021-08-27 17:58:18 +02:00
commit a75a648f84
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/inetdevice.h
View file

@ -41,7 +41,7 @@ struct in_device {
unsigned long mr_qri; /* Query Response Interval */
unsigned char mr_qrv; /* Query Robustness Variable */
unsigned char mr_gq_running;
u32 mr_ifc_count;
unsigned char mr_ifc_count;
struct timer_list mr_gq_timer; /* general query timer */
struct timer_list mr_ifc_timer; /* interface change timer */

2
net/ipv4/igmp.c
View file

@ -803,7 +803,7 @@ static void igmp_gq_timer_expire(struct timer_list *t)
static void igmp_ifc_timer_expire(struct timer_list *t)
{
struct in_device *in_dev = from_timer(in_dev, t, mr_ifc_timer);
u32 mr_ifc_count;
u8 mr_ifc_count;
igmpv3_send_cr(in_dev);
restart: