redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

cfg80211: docbook: add interface combinations documentation 

Add the ieee80211_iface_limit and the ieee80211_iface_combination
structures to docbook.  Reformat the examples of combinations
slightly, so it looks a bit better on docbook.

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
hifive-unleashed-5.1
Luciano Coelho 2014-02-20 16:45:34 +02:00 committed by Johannes Berg
parent 0fcf8ac5ac
commit b80edbc177
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/DocBook/80211.tmpl
View File

@ -98,6 +98,8 @@
!Finclude/net/cfg80211.h priv_to_wiphy
!Finclude/net/cfg80211.h set_wiphy_dev
!Finclude/net/cfg80211.h wdev_priv
!Finclude/net/cfg80211.h ieee80211_iface_limit
!Finclude/net/cfg80211.h ieee80211_iface_combination
</chapter>
<chapter>
<title>Actions and configuration</title>

12
include/net/cfg80211.h
View File

@ -2616,9 +2616,12 @@ struct ieee80211_iface_limit {
* only in special cases.
* @radar_detect_widths: bitmap of channel widths supported for radar detection
*
* These examples can be expressed as follows:
* With this structure the driver can describe which interface
* combinations it supports concurrently.
*
* Allow #STA <= 1, #AP <= 1, matching BI, channels = 1, 2 total:
* Examples:
*
* 1. Allow #STA <= 1, #AP <= 1, matching BI, channels = 1, 2 total:
*
* struct ieee80211_iface_limit limits1[] = {
* { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), },
@ -2632,7 +2635,7 @@ struct ieee80211_iface_limit {
* };
*
*
* Allow #{AP, P2P-GO} <= 8, channels = 1, 8 total:
* 2. Allow #{AP, P2P-GO} <= 8, channels = 1, 8 total:
*
* struct ieee80211_iface_limit limits2[] = {
* { .max = 8, .types = BIT(NL80211_IFTYPE_AP) |
@ -2646,7 +2649,8 @@ struct ieee80211_iface_limit {
* };
*
*
* Allow #STA <= 1, #{P2P-client,P2P-GO} <= 3 on two channels, 4 total.
* 3. Allow #STA <= 1, #{P2P-client,P2P-GO} <= 3 on two channels, 4 total.
*
* This allows for an infrastructure connection and three P2P connections.
*
* struct ieee80211_iface_limit limits3[] = {