---

yaml --- r: 265493 b: refs/heads/master c: d2da587 h: refs/heads/master i: 265491: 5f69e20 v: v3
git-mirror · Aug 10, 2011 · ef5697a · ef5697a
1 parent 3bcfb1d
commit ef5697a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 281ed297ffb6741550e33b99b24ac3f5c16e3458
+refs/heads/master: d2da587839b29ccc5b920fffdb848d7bdb36f11f
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
@@ -871,8 +871,7 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,
 		NLA_PUT_U32(msg, NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION,
 			    dev->wiphy.max_remain_on_channel_duration);
 
-	/* for now at least assume all drivers have it */
-	if (dev->ops->mgmt_tx)
+	if (dev->ops->mgmt_tx_cancel_wait)
 		NLA_PUT_FLAG(msg, NL80211_ATTR_OFFCHANNEL_TX_OK);
 
 	if (mgmt_stypes) {