[patch] revert_br_mcast_rcv.patch

revert_br_mcast_rcv.patch (text/plain), 968 bytes, created by Stratos Psomadakis (RETIRED) on 2011-10-25 07:28:06 UTC

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 995cbe0..22d2d1a 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1456,7 +1456,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
 {
 	struct sk_buff *skb2;
 	const struct ipv6hdr *ip6h;
-	u8 icmp6_type;
+	struct icmp6hdr *icmp6h;
 	u8 nexthdr;
 	unsigned len;
 	int offset;
@@ -1502,9 +1502,9 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
 	__skb_pull(skb2, offset);
 	skb_reset_transport_header(skb2);
 
-	icmp6_type = icmp6_hdr(skb2)->icmp6_type;
+	icmp6h = icmp6_hdr(skb2);
 
-	switch (icmp6_type) {
+	switch (icmp6h->icmp6_type) {
 	case ICMPV6_MGM_QUERY:
 	case ICMPV6_MGM_REPORT:
 	case ICMPV6_MGM_REDUCTION:
@@ -1544,7 +1544,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
 
 	BR_INPUT_SKB_CB(skb)->igmp = 1;
 
-	switch (icmp6_type) {
+	switch (icmp6h->icmp6_type) {
 	case ICMPV6_MGM_REPORT:
 	    {
 		struct mld_msg *mld;