From 98a6c608a8cc5c9355ea701769ef0e6b5a434625 Mon Sep 17 00:00:00 2001
From: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Date: Thu, 22 Dec 2011 12:15:27 +0530
Subject: [PATCH] --- yaml --- r: 290239 b: refs/heads/master c:
 e68f67509d92114c55938898643600c23f88b4c1 h: refs/heads/master i:   290237:
 c4fd1d0a4b6c8052de93a341df16f0125ccd4eef   290235:
 6371a5bd43c29ef25b3d011ada30c538c74c81ae   290231:
 0227d55cdc8b1af607dcfa8ad43bbc2e5af88851   290223:
 d6d26144331b96d54160be4558b500796bf0ef23   290207:
 3ccf08436cd6910c813428873705c12c0a466538   290175:
 d2438fc918603b197a8bdc38469578eb0c9e0ba5 v: v3

---
 [refs]                                           |  2 +-
 trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1dfb5836851e..0563ec6473ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65a8b4cc511b68712799e91137324f2abece7d3e
+refs/heads/master: e68f67509d92114c55938898643600c23f88b4c1
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
index 45b0d974e4f7..d6806be5895b 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -2044,7 +2044,18 @@ static int ath6kl_set_channel(struct wiphy *wiphy, struct net_device *dev,
 			      struct ieee80211_channel *chan,
 			      enum nl80211_channel_type channel_type)
 {
-	struct ath6kl_vif *vif = netdev_priv(dev);
+	struct ath6kl_vif *vif;
+
+	/*
+	 * 'dev' could be NULL if a channel change is required for the hardware
+	 * device itself, instead of a particular VIF.
+	 *
+	 * FIXME: To be handled properly when monitor mode is supported.
+	 */
+	if (!dev)
+		return -EBUSY;
+
+	vif = netdev_priv(dev);
 
 	if (!ath6kl_cfg80211_ready(vif))
 		return -EIO;