From 2f2468eac53bfc2a8b9237d6eca016c172ca9fa2 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Thu, 15 Mar 2012 16:22:05 -0700
Subject: [PATCH] --- yaml --- r: 300618 b: refs/heads/master c:
 d17087e78d3961bd42f99cc3cf8cbf2d7d8ef55e h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/net/mac80211/driver-ops.h | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8b1389fed348..241f267fdedb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68d9e1fa24d9c7c2e527f49df8d18fb8cf0ec943
+refs/heads/master: d17087e78d3961bd42f99cc3cf8cbf2d7d8ef55e
diff --git a/trunk/net/mac80211/driver-ops.h b/trunk/net/mac80211/driver-ops.h
index af4691fed645..e8dbda1b5b8a 100644
--- a/trunk/net/mac80211/driver-ops.h
+++ b/trunk/net/mac80211/driver-ops.h
@@ -7,7 +7,9 @@
 
 static inline void check_sdata_in_driver(struct ieee80211_sub_if_data *sdata)
 {
-	WARN_ON(!(sdata->flags & IEEE80211_SDATA_IN_DRIVER));
+	WARN(!(sdata->flags & IEEE80211_SDATA_IN_DRIVER),
+	     "%s:  Failed check-sdata-in-driver check, flags: 0x%x\n",
+	     sdata->dev->name, sdata->flags);
 }
 
 static inline struct ieee80211_sub_if_data *