From 50637be2996a88810817b2748a2f6551a55e9917 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 27 Aug 2021 17:58:18 +0200 Subject: [PATCH] Revert "net: igmp: increase size of mr_ifc_count" This reverts commit 4d3c5c319b197357eb6ba8346a7c82fa287bebc3 which is commit b69dd5b3780a7298bd893816a09da751bc0636f7 upstream. This breaks the kernel abi and is not an issue for Android systems. Signed-off-by: Greg Kroah-Hartman Change-Id: I1006e8d8ca58cf07ea23404e386ba58651424eb2 --- include/linux/inetdevice.h | 2 +- net/ipv4/igmp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/inetdevice.h b/include/linux/inetdevice.h index b68fca08be27..3515ca64e638 100644 --- a/include/linux/inetdevice.h +++ b/include/linux/inetdevice.h @@ -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 */ diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index d2b1ae83f258..cfa31c34b5bb 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -805,7 +805,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: