git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
[pandora-kernel.git]
/
net
/
bridge
/
br_multicast.c
diff --git
a/net/bridge/br_multicast.c
b/net/bridge/br_multicast.c
index
995cbe0
..
a5f4e57
100644
(file)
--- a/
net/bridge/br_multicast.c
+++ b/
net/bridge/br_multicast.c
@@
-1501,6
+1501,8
@@
static int br_multicast_ipv6_rcv(struct net_bridge *br,
__skb_pull(skb2, offset);
skb_reset_transport_header(skb2);
__skb_pull(skb2, offset);
skb_reset_transport_header(skb2);
+ skb_postpull_rcsum(skb2, skb_network_header(skb2),
+ skb_network_header_len(skb2));
icmp6_type = icmp6_hdr(skb2)->icmp6_type;
icmp6_type = icmp6_hdr(skb2)->icmp6_type;
@@
-1770,7
+1772,7
@@
int br_multicast_toggle(struct net_bridge *br, unsigned long val)
int err = 0;
struct net_bridge_mdb_htable *mdb;
int err = 0;
struct net_bridge_mdb_htable *mdb;
- spin_lock(&br->multicast_lock);
+ spin_lock
_bh
(&br->multicast_lock);
if (br->multicast_disabled == !val)
goto unlock;
if (br->multicast_disabled == !val)
goto unlock;
@@
-1806,7
+1808,7
@@
rollback:
}
unlock:
}
unlock:
- spin_unlock(&br->multicast_lock);
+ spin_unlock
_bh
(&br->multicast_lock);
return err;
}
return err;
}