kernel: fix uninitialized variable in bridge multicast-to-unicast patch on 4.4
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48327
This commit is contained in:
parent
e620f4d6f8
commit
fcfc7eb2ae
1 changed files with 5 additions and 2 deletions
|
@ -135,7 +135,11 @@ Implement optinal multicast->unicast conversion for igmp snooping
|
||||||
struct igmpv3_report *ih;
|
struct igmpv3_report *ih;
|
||||||
struct igmpv3_grec *grec;
|
struct igmpv3_grec *grec;
|
||||||
int i;
|
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 ||
|
if ((type == IGMPV3_CHANGE_TO_INCLUDE ||
|
||||||
type == IGMPV3_MODE_IS_INCLUDE) &&
|
type == IGMPV3_MODE_IS_INCLUDE) &&
|
||||||
ntohs(grec->grec_nsrcs) == 0) {
|
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);
|
+ br_ip4_multicast_leave_group(br, port, group, vid, src);
|
||||||
} else {
|
} else {
|
||||||
- err = br_ip4_multicast_add_group(br, port, group, vid);
|
- 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);
|
+ err = br_ip4_multicast_add_group(br, port, group, vid, src);
|
||||||
if (err)
|
if (err)
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue