From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 11 Feb 2016 15:00:19 +0000 (+0000)
Subject: kernel: fix uninitialized variable in bridge multicast-to-unicast patch on 4.3
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2c17b8bcc52de38f4a81ec408028472b2a76d57b;p=openwrt%2Fstaging%2Fblocktrron.git

kernel: fix uninitialized variable in bridge multicast-to-unicast patch on 4.3

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48690
---

diff --git a/target/linux/generic/patches-4.3/645-bridge_multicast_to_unicast.patch b/target/linux/generic/patches-4.3/645-bridge_multicast_to_unicast.patch
index d3ce4efeae..0e360fc1cf 100644
--- a/target/linux/generic/patches-4.3/645-bridge_multicast_to_unicast.patch
+++ b/target/linux/generic/patches-4.3/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;