aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-18 20:16:37 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-18 20:16:37 +0000
commitfcfc7eb2aedbb7467d0290433ad7554c65730b51 (patch)
tree94203f14588811c2b76ae25caf04ad76305eae0d
parente620f4d6f83d457579a6ac53d8659f3171739d18 (diff)
downloadupstream-fcfc7eb2aedbb7467d0290433ad7554c65730b51.tar.gz
upstream-fcfc7eb2aedbb7467d0290433ad7554c65730b51.tar.bz2
upstream-fcfc7eb2aedbb7467d0290433ad7554c65730b51.zip
kernel: fix uninitialized variable in bridge multicast-to-unicast patch on 4.4
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48327
-rw-r--r--target/linux/generic/patches-4.4/645-bridge_multicast_to_unicast.patch7
1 files 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;