From 9d3123f6e83b834f87c4276807fd30d92dc89ca2 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 18 Jan 2016 20:16:37 +0000 Subject: kernel: fix uninitialized variable in bridge multicast-to-unicast patch on 4.4 Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48327 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic/patches-4.4/645-bridge_multicast_to_unicast.patch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch b/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch index 830883526d..59aa1eda15 100644 --- a/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch +++ b/target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch @@ -135,7 +135,11 @@ Implement optinal multicast->unicast conversion for igmp snooping struct igmpv3_report *ih; struct igmpv3_grec *grec; int i; -@@ -1038,9 +1062,10 @@ static int br_ip4_multicast_igmp3_report +@@ -1035,12 +1059,13 @@ static int br_ip4_multicast_igmp3_report + continue; + } + ++ src = eth_hdr(skb)->h_source; if ((type == IGMPV3_CHANGE_TO_INCLUDE || type == IGMPV3_MODE_IS_INCLUDE) && ntohs(grec->grec_nsrcs) == 0) { @@ -143,7 +147,6 @@ Implement optinal multicast->unicast conversion for igmp snooping + br_ip4_multicast_leave_group(br, port, group, vid, src); } else { - err = br_ip4_multicast_add_group(br, port, group, vid); -+ src = eth_hdr(skb)->h_source; + err = br_ip4_multicast_add_group(br, port, group, vid, src); if (err) break; -- cgit v1.2.3