Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8cceb85 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "net: igmp: increase size of mr_ifc_count" 



This reverts commit ec75ebd1 which is
commit b69dd5b3780a7298bd893816a09da751bc0636f7 upstream.

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

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I1006e8d8ca58cf07ea23404e386ba58651424eb2
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 2c08860d

include/linux/inetdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

net/ipv4/igmp.c

+1 −1
Original line number Diff line number Diff line
@@ -807,7 +807,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: