From fb267f653bdeecb07f5b06e8045e67367ed62154 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Sat, 8 Jan 2011 10:30:54 -0800
Subject: [PATCH] --- yaml --- r: 236750 b: refs/heads/master c:
 b305dae488193b65cfa80e1c06c0aa0ce60005a9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 733a45695b58..5a7676c704cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea67485ae6894e603984c3b13b8df54ae2c128d8
+refs/heads/master: b305dae488193b65cfa80e1c06c0aa0ce60005a9
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index 1236710f70e0..f36d70f5b062 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -2711,7 +2711,7 @@ static bool ieee80211_prepare_and_rx_handle(struct ieee80211_rx_data *rx,
 		if (!skb) {
 			if (net_ratelimit())
 				wiphy_debug(local->hw.wiphy,
-					"failed to copy multicast frame for %s\n",
+					"failed to copy skb for %s\n",
 					sdata->name);
 			return true;
 		}