---

yaml --- r: 290239 b: refs/heads/master c: e68f675 h: refs/heads/master i: 290237: c4fd1d0 290235: 6371a5b 290231: 0227d55 290223: d6d2614 290207: 3ccf084 290175: d2438fc v: v3
git-mirror · Dec 23, 2011 · 98a6c60 · 98a6c60
1 parent 7a24e9e
commit 98a6c60
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git 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
@@ -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;