From 294ba77481a4a5be05004f3e8713b4d81e608457 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 7 Jul 2009 03:43:02 +0200
Subject: [PATCH] --- yaml --- r: 155137 b: refs/heads/master c:
 4ff176674e75bdee9022dded415fb805f15700ad h: refs/heads/master i:   155135:
 6dd8406e32e64aa0c33084dcfd3b79c5a3925a24 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/mac80211_hwsim.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5a0719c492b8..4b63705d28e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fbddeb5c409c90be4706ea2beb7f1fc02100c72
+refs/heads/master: 4ff176674e75bdee9022dded415fb805f15700ad
diff --git a/trunk/drivers/net/wireless/mac80211_hwsim.c b/trunk/drivers/net/wireless/mac80211_hwsim.c
index e789c6e9938c..a111bda392e2 100644
--- a/trunk/drivers/net/wireless/mac80211_hwsim.c
+++ b/trunk/drivers/net/wireless/mac80211_hwsim.c
@@ -418,6 +418,7 @@ static bool mac80211_hwsim_tx_frame(struct ieee80211_hw *hw,
 			continue;
 
 		if (!data2->started || !hwsim_ps_rx_ok(data2, skb) ||
+		    !data->channel || !data2->channel ||
 		    data->channel->center_freq != data2->channel->center_freq ||
 		    !(data->group & data2->group))
 			continue;