From ef5697aa4a0399e4a825c6f9557f01052a191f3c Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 8 Aug 2011 12:10:30 +0300 Subject: [PATCH] --- yaml --- r: 265493 b: refs/heads/master c: d2da587839b29ccc5b920fffdb848d7bdb36f11f h: refs/heads/master i: 265491: 5f69e20e74b7f6660457761f66c34fcca3597d67 v: v3 --- [refs] | 2 +- trunk/net/wireless/nl80211.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 855369213705..e84a172e683a 100644 --- 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 index e83e7fee3bc0..3b5dc9186071 100644 --- 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) {