From: Jouni Malinen Date: Mon, 8 Aug 2011 09:10:30 +0000 (+0300) Subject: nl80211: Indicate driver-based offchannel TX on mgmt_tx_cancel_wait X-Git-Tag: MMI-PSA29.97-13-9~18194^2~254^2~324 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d2da587839b29ccc5b920fffdb848d7bdb36f11f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git nl80211: Indicate driver-based offchannel TX on mgmt_tx_cancel_wait Drivers that support frame transmission with mgmt_tx() may not support driver-based offchannel TX. Use mgmt_tx_cancel_wait instead of mgmt_tx when figuring out whether to indicate support for this with NL80211_ATTR_OFFCHANNEL_TX_OK. Signed-off-by: Jouni Malinen Acked-by: Johannes Berg Signed-off-by: John W. Linville --- diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index e83e7fee3bc0..3b5dc9186071 100644 --- a/net/wireless/nl80211.c +++ b/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) {