From 575954f07aacf5fa005ccb3c2a3e12baced63b97 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 29 Jul 2010 01:12:31 +0000
Subject: [PATCH] --- yaml --- r: 204033 b: refs/heads/master c:
 6d1d1d398cb7db7a12c5d652d50f85355345234f h: refs/heads/master i:   204031:
 a58b2f909037dae2cc7a3d6fa3d9307e20360bcf v: v3

---
 [refs]                       | 2 +-
 trunk/net/bridge/br_device.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 75946a2773bf..30ce703423e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3bdb549e30e7a263f7a589747c40e9c50110315
+refs/heads/master: 6d1d1d398cb7db7a12c5d652d50f85355345234f
diff --git a/trunk/net/bridge/br_device.c b/trunk/net/bridge/br_device.c
index 4cec8051164d..f49bcd9d9113 100644
--- a/trunk/net/bridge/br_device.c
+++ b/trunk/net/bridge/br_device.c
@@ -48,8 +48,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	rcu_read_lock();
 	if (is_multicast_ether_addr(dest)) {
-		if (br_multicast_rcv(br, NULL, skb))
+		if (br_multicast_rcv(br, NULL, skb)) {
+			kfree_skb(skb);
 			goto out;
+		}
 
 		mdst = br_mdb_get(br, skb);
 		if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb))