---

yaml --- r: 188157 b: refs/heads/master c: 8440853 h: refs/heads/master i: 188155: 73ef71e v: v3
git-mirror · Mar 16, 2010 · c42e937 · c42e937
1 parent 6d27392
commit c42e937
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ba8c9ec25465cd0680b80c0f5836f558e3b972d
+refs/heads/master: 8440853bb70010f2f8edc26cb0f7af60da8b2c5a
diff --git a/trunk/net/bridge/br_multicast.c b/trunk/net/bridge/br_multicast.c
@@ -991,7 +991,7 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
 
 		err = pskb_trim_rcsum(skb2, len);
 		if (err)
-			return err;
+			goto err_out;
 	}
 
 	len -= ip_hdrlen(skb2);
@@ -1013,7 +1013,7 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
 	case CHECKSUM_NONE:
 		skb2->csum = 0;
 		if (skb_checksum_complete(skb2))
-			return -EINVAL;
+			goto out;
 	}
 
 	err = 0;
@@ -1040,6 +1040,7 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
 
 out:
 	__skb_push(skb2, offset);
+err_out:
 	if (skb2 != skb)
 		kfree_skb(skb2);
 	return err;