From e39b4f477b5cb7101a31c939c1f396611b441089 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 4 Jan 2011 13:02:32 +0100 Subject: [PATCH] --- yaml --- r: 231197 b: refs/heads/master c: 4976b4eb9d083f035aa97afec560c7e1c16c6afd h: refs/heads/master i: 231195: 96df59d817f4a1ecc8caf955188492d58baa9f52 v: v3 --- [refs] | 2 +- trunk/include/net/mac80211.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 17928babaaaa..35bcbfd1ad5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d50192c17d4481c0e34c1ed2ae24fd7bc16e121 +refs/heads/master: 4976b4eb9d083f035aa97afec560c7e1c16c6afd diff --git a/trunk/include/net/mac80211.h b/trunk/include/net/mac80211.h index 5b3fd5add7a4..3ce8e1f70c06 100644 --- a/trunk/include/net/mac80211.h +++ b/trunk/include/net/mac80211.h @@ -1753,6 +1753,16 @@ enum ieee80211_ampdu_mlme_action { * (also see nl80211.h @NL80211_ATTR_WIPHY_ANTENNA_TX). * * @get_antenna: Get current antenna configuration from device (tx_ant, rx_ant). + * + * @remain_on_channel: Starts an off-channel period on the given channel, must + * call back to ieee80211_ready_on_channel() when on that channel. Note + * that normal channel traffic is not stopped as this is intended for hw + * offload. Frames to transmit on the off-channel channel are transmitted + * normally except for the %IEEE80211_TX_CTL_TX_OFFCHAN flag. When the + * duration (which will always be non-zero) expires, the driver must call + * ieee80211_remain_on_channel_expired(). This callback may sleep. + * @cancel_remain_on_channel: Requests that an ongoing off-channel period is + * aborted before it expires. This callback may sleep. */ struct ieee80211_ops { int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);