From 28980252e0d1a991a54c4f265517108bf9474637 Mon Sep 17 00:00:00 2001
From: Luis Carlos Cobo <luisca@cozybit.com>
Date: Mon, 5 May 2008 12:29:42 -0700
Subject: [PATCH] --- yaml --- r: 96552 b: refs/heads/master c:
 69687a0b9934942e61bf8148c242adea87183a5b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b4b25f5a47fd..99f97c02e917 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef269254772a0d2253c85cafe160e3f6528eb292
+refs/heads/master: 69687a0b9934942e61bf8148c242adea87183a5b
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 02f436a86061..9c57b3af0244 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1305,11 +1305,11 @@ ieee80211_deliver_skb(struct ieee80211_rx_data *rx)
 		if (is_multicast_ether_addr(skb->data)) {
 			if (*mesh_ttl > 0) {
 				xmit_skb = skb_copy(skb, GFP_ATOMIC);
-				if (!xmit_skb && net_ratelimit())
+				if (xmit_skb)
+					xmit_skb->pkt_type = PACKET_OTHERHOST;
+				else if (net_ratelimit())
 					printk(KERN_DEBUG "%s: failed to clone "
 					       "multicast frame\n", dev->name);
-				else
-					xmit_skb->pkt_type = PACKET_OTHERHOST;
 			} else
 				IEEE80211_IFSTA_MESH_CTR_INC(&sdata->u.sta,
 							     dropped_frames_ttl);