aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/cfg80211.h
diff options
context:
space:
mode:
authorChun-Yeow Yeoh <yeohchunyeow@gmail.com>2012-06-10 23:59:10 -0400
committerJohannes Berg <johannes.berg@intel.com>2012-06-11 03:22:57 -0400
commit3ddd53f392c4f8e19e1110d1bdef770008b128b8 (patch)
tree5d3dcb541d9569a5a1a234072510ff2ee743dbc6 /include/net/cfg80211.h
parent35b3fe1caa26e1ffc5144d3faadecdfa0a8a0f44 (diff)
cfg80211: add missing kernel-doc for mesh configuration structure
Add the missing kernel-doc for mesh configuration parameters as pointed out by Johannes Berg. Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'include/net/cfg80211.h')
-rw-r--r--include/net/cfg80211.h59
1 files changed, 49 insertions, 10 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 7319f25250b..a129ee2f548 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -790,26 +790,69 @@ struct bss_parameters {
790 int ht_opmode; 790 int ht_opmode;
791}; 791};
792 792
793/* 793/**
794 * struct mesh_config - 802.11s mesh configuration 794 * struct mesh_config - 802.11s mesh configuration
795 * 795 *
796 * These parameters can be changed while the mesh is active. 796 * These parameters can be changed while the mesh is active.
797 *
798 * @dot11MeshRetryTimeout: the initial retry timeout in millisecond units used
799 * by the Mesh Peering Open message
800 * @dot11MeshConfirmTimeout: the initial retry timeout in millisecond units
801 * used by the Mesh Peering Open message
802 * @dot11MeshHoldingTimeout: the confirm timeout in millisecond units used by
803 * the mesh peering management to close a mesh peering
804 * @dot11MeshMaxPeerLinks: the maximum number of peer links allowed on this
805 * mesh interface
806 * @dot11MeshMaxRetries: the maximum number of peer link open retries that can
807 * be sent to establish a new peer link instance in a mesh
808 * @dot11MeshTTL: the value of TTL field set at a source mesh STA
809 * @element_ttl: the value of TTL field set at a mesh STA for path selection
810 * elements
811 * @auto_open_plinks: whether we should automatically open peer links when we
812 * detect compatible mesh peers
813 * @dot11MeshNbrOffsetMaxNeighbor: the maximum number of neighbors to
814 * synchronize to for 11s default synchronization method
815 * @dot11MeshHWMPmaxPREQretries: the number of action frames containing a PREQ
816 * that an originator mesh STA can send to a particular path target
817 * @path_refresh_time: how frequently to refresh mesh paths in milliseconds
818 * @min_discovery_timeout: the minimum length of time to wait until giving up on
819 * a path discovery in milliseconds
820 * @dot11MeshHWMPactivePathTimeout: the time (in TUs) for which mesh STAs
821 * receiving a PREQ shall consider the forwarding information from the
822 * root to be valid. (TU = time unit)
823 * @dot11MeshHWMPpreqMinInterval: the minimum interval of time (in TUs) during
824 * which a mesh STA can send only one action frame containing a PREQ
825 * element
826 * @dot11MeshHWMPperrMinInterval: the minimum interval of time (in TUs) during
827 * which a mesh STA can send only one Action frame containing a PERR
828 * element
829 * @dot11MeshHWMPnetDiameterTraversalTime: the interval of time (in TUs) that
830 * it takes for an HWMP information element to propagate across the mesh
831 * @dot11MeshHWMPRootMode: the configuration of a mesh STA as root mesh STA
832 * @dot11MeshHWMPRannInterval: the interval of time (in TUs) between root
833 * announcements are transmitted
834 * @dot11MeshGateAnnouncementProtocol: whether to advertise that this mesh
835 * station has access to a broader network beyond the MBSS. (This is
836 * missnamed in draft 12.0: dot11MeshGateAnnouncementProtocol set to true
837 * only means that the station will announce others it's a mesh gate, but
838 * not necessarily using the gate announcement protocol. Still keeping the
839 * same nomenclature to be in sync with the spec)
840 * @dot11MeshForwarding: whether the Mesh STA is forwarding or non-forwarding
841 * entity (default is TRUE - forwarding entity)
842 * @rssi_threshold: the threshold for average signal strength of candidate
843 * station to establish a peer link
844 * @ht_opmode: mesh HT protection mode
797 */ 845 */
798struct mesh_config { 846struct mesh_config {
799 /* Timeouts in ms */
800 /* Mesh plink management parameters */
801 u16 dot11MeshRetryTimeout; 847 u16 dot11MeshRetryTimeout;
802 u16 dot11MeshConfirmTimeout; 848 u16 dot11MeshConfirmTimeout;
803 u16 dot11MeshHoldingTimeout; 849 u16 dot11MeshHoldingTimeout;
804 u16 dot11MeshMaxPeerLinks; 850 u16 dot11MeshMaxPeerLinks;
805 u8 dot11MeshMaxRetries; 851 u8 dot11MeshMaxRetries;
806 u8 dot11MeshTTL; 852 u8 dot11MeshTTL;
807 /* ttl used in path selection information elements */
808 u8 element_ttl; 853 u8 element_ttl;
809 bool auto_open_plinks; 854 bool auto_open_plinks;
810 /* neighbor offset synchronization */
811 u32 dot11MeshNbrOffsetMaxNeighbor; 855 u32 dot11MeshNbrOffsetMaxNeighbor;
812 /* HWMP parameters */
813 u8 dot11MeshHWMPmaxPREQretries; 856 u8 dot11MeshHWMPmaxPREQretries;
814 u32 path_refresh_time; 857 u32 path_refresh_time;
815 u16 min_discovery_timeout; 858 u16 min_discovery_timeout;
@@ -819,10 +862,6 @@ struct mesh_config {
819 u16 dot11MeshHWMPnetDiameterTraversalTime; 862 u16 dot11MeshHWMPnetDiameterTraversalTime;
820 u8 dot11MeshHWMPRootMode; 863 u8 dot11MeshHWMPRootMode;
821 u16 dot11MeshHWMPRannInterval; 864 u16 dot11MeshHWMPRannInterval;
822 /* This is missnamed in draft 12.0: dot11MeshGateAnnouncementProtocol
823 * set to true only means that the station will announce others it's a
824 * mesh gate, but not necessarily using the gate announcement protocol.
825 * Still keeping the same nomenclature to be in sync with the spec. */
826 bool dot11MeshGateAnnouncementProtocol; 865 bool dot11MeshGateAnnouncementProtocol;
827 bool dot11MeshForwarding; 866 bool dot11MeshForwarding;
828 s32 rssi_threshold; 867 s32 rssi_threshold;