Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are a raw update to a vanilla kernel 4.1.10, with the
[kvmfornfv.git]
/
kernel
/
net
/
bridge
/
br_multicast.c
diff --git
a/kernel/net/bridge/br_multicast.c
b/kernel/net/bridge/br_multicast.c
index
ff667e1
..
9ba383f
100644
(file)
--- a/
kernel/net/bridge/br_multicast.c
+++ b/
kernel/net/bridge/br_multicast.c
@@
-980,7
+980,7
@@
static int br_ip4_multicast_igmp3_report(struct net_bridge *br,
ih = igmpv3_report_hdr(skb);
num = ntohs(ih->ngrec);
ih = igmpv3_report_hdr(skb);
num = ntohs(ih->ngrec);
- len = sizeof(*ih);
+ len = s
kb_transport_offset(skb) + s
izeof(*ih);
for (i = 0; i < num; i++) {
len += sizeof(*grec);
for (i = 0; i < num; i++) {
len += sizeof(*grec);
@@
-1035,7
+1035,7
@@
static int br_ip6_multicast_mld2_report(struct net_bridge *br,
icmp6h = icmp6_hdr(skb);
num = ntohs(icmp6h->icmp6_dataun.un_data16[1]);
icmp6h = icmp6_hdr(skb);
num = ntohs(icmp6h->icmp6_dataun.un_data16[1]);
- len = sizeof(*icmp6h);
+ len = s
kb_transport_offset(skb) + s
izeof(*icmp6h);
for (i = 0; i < num; i++) {
__be16 *nsrcs, _nsrcs;
for (i = 0; i < num; i++) {
__be16 *nsrcs, _nsrcs;