1 files changed, 4 insertions, 1 deletions

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 81f2389f78eb..247514793101 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -23,6 +23,7 @@
 #include <linux/skbuff.h>
 #include <linux/slab.h>
 #include <linux/timer.h>
+#include <linux/inetdevice.h>
 #include <net/ip.h>
 #if IS_ENABLED(CONFIG_IPV6)
 #include <net/ipv6.h>
@@ -381,7 +382,8 @@ static struct sk_buff *br_ip4_multicast_alloc_query(struct net_bridge *br,
         iph->frag_off = htons(IP_DF);
         iph->ttl = 1;
         iph->protocol = IPPROTO_IGMP;
-        iph->saddr = 0;
+        iph->saddr = br->multicast_query_use_ifaddr ?
+                     inet_select_addr(br->dev, 0, RT_SCOPE_LINK) : 0;
         iph->daddr = htonl(INADDR_ALLHOSTS_GROUP);
         ((u8 *)&iph[1])[0] = IPOPT_RA;
         ((u8 *)&iph[1])[1] = 4;
@@ -1618,6 +1620,7 @@ void br_multicast_init(struct net_bridge *br)
 
         br->multicast_router = 1;
         br->multicast_querier = 0;
+        br->multicast_query_use_ifaddr = 0;
         br->multicast_last_member_count = 2;
         br->multicast_startup_query_count = 2;