diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-12 21:52:31 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-12 21:52:31 -0500 |
| commit | bb1231052e265e960d902ab32e67c5ccdabc9434 (patch) | |
| tree | 3dd999a598355ff0d82f56eea1ffa49a81c8a42c /include/net | |
| parent | 72b43d0898e97f588293b4a24b33c58c46633d81 (diff) | |
| parent | 4e5518ca53be29c1ec3c00089c97bef36bfed515 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/cfg80211.h | 2 | ||||
| -rw-r--r-- | include/net/mac80211.h | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index bcc9f448ec4e..1322695beb52 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
| @@ -1103,6 +1103,8 @@ struct cfg80211_pmksa { | |||
| 1103 | * @change_mpath: change a given mesh path | 1103 | * @change_mpath: change a given mesh path |
| 1104 | * @get_mpath: get a mesh path for the given parameters | 1104 | * @get_mpath: get a mesh path for the given parameters |
| 1105 | * @dump_mpath: dump mesh path callback -- resume dump at index @idx | 1105 | * @dump_mpath: dump mesh path callback -- resume dump at index @idx |
| 1106 | * @join_mesh: join the mesh network with the specified parameters | ||
| 1107 | * @leave_mesh: leave the current mesh network | ||
| 1106 | * | 1108 | * |
| 1107 | * @get_mesh_config: Get the current mesh configuration | 1109 | * @get_mesh_config: Get the current mesh configuration |
| 1108 | * | 1110 | * |
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 5b3fd5add7a4..62c0ce2d1dc8 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -337,6 +337,10 @@ struct ieee80211_bss_conf { | |||
| 337 | * @IEEE80211_TX_CTL_LDPC: tells the driver to use LDPC for this frame | 337 | * @IEEE80211_TX_CTL_LDPC: tells the driver to use LDPC for this frame |
| 338 | * @IEEE80211_TX_CTL_STBC: Enables Space-Time Block Coding (STBC) for this | 338 | * @IEEE80211_TX_CTL_STBC: Enables Space-Time Block Coding (STBC) for this |
| 339 | * frame and selects the maximum number of streams that it can use. | 339 | * frame and selects the maximum number of streams that it can use. |
| 340 | * @IEEE80211_TX_CTL_TX_OFFCHAN: Marks this packet to be transmitted on | ||
| 341 | * the off-channel channel when a remain-on-channel offload is done | ||
| 342 | * in hardware -- normal packets still flow and are expected to be | ||
| 343 | * handled properly by the device. | ||
| 340 | * | 344 | * |
| 341 | * Note: If you have to add new flags to the enumeration, then don't | 345 | * Note: If you have to add new flags to the enumeration, then don't |
| 342 | * forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary. | 346 | * forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary. |
| @@ -1753,6 +1757,16 @@ enum ieee80211_ampdu_mlme_action { | |||
| 1753 | * (also see nl80211.h @NL80211_ATTR_WIPHY_ANTENNA_TX). | 1757 | * (also see nl80211.h @NL80211_ATTR_WIPHY_ANTENNA_TX). |
| 1754 | * | 1758 | * |
| 1755 | * @get_antenna: Get current antenna configuration from device (tx_ant, rx_ant). | 1759 | * @get_antenna: Get current antenna configuration from device (tx_ant, rx_ant). |
| 1760 | * | ||
| 1761 | * @remain_on_channel: Starts an off-channel period on the given channel, must | ||
| 1762 | * call back to ieee80211_ready_on_channel() when on that channel. Note | ||
| 1763 | * that normal channel traffic is not stopped as this is intended for hw | ||
| 1764 | * offload. Frames to transmit on the off-channel channel are transmitted | ||
| 1765 | * normally except for the %IEEE80211_TX_CTL_TX_OFFCHAN flag. When the | ||
| 1766 | * duration (which will always be non-zero) expires, the driver must call | ||
| 1767 | * ieee80211_remain_on_channel_expired(). This callback may sleep. | ||
| 1768 | * @cancel_remain_on_channel: Requests that an ongoing off-channel period is | ||
| 1769 | * aborted before it expires. This callback may sleep. | ||
| 1756 | */ | 1770 | */ |
| 1757 | struct ieee80211_ops { | 1771 | struct ieee80211_ops { |
| 1758 | int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb); | 1772 | int (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb); |