diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-20 23:44:53 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-20 23:44:52 -0800 |
| commit | f322ad9eeac84726ad2a09a9fe934699654f9a0c (patch) | |
| tree | 80f4e0b695785c0ee8855626a831f6affafcfd63 /include/net | |
| parent | bd21566fda4458c57e91595709eccb3e1af754b3 (diff) | |
| parent | af16d9526ad6495564d262af453bbfc97e50f762 (diff) | |
Merge "cfg80211: add checks for beacon rate, extend to mesh"
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/cfg80211.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index cc1e8d6b3454..195b625a4a76 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -731,7 +731,7 @@ struct cfg80211_bitrate_mask { * MAC address based access control * @pbss: If set, start as a PCP instead of AP. Relevant for DMG * networks. - * @beacon_rate: masks for setting user configured beacon tx rate. + * @beacon_rate: bitrate to be used for beacons */ struct cfg80211_ap_settings { struct cfg80211_chan_def chandef; @@ -1393,6 +1393,7 @@ struct mesh_config { * @beacon_interval: beacon interval to use * @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a] * @basic_rates: basic rates to use when creating the mesh + * @beacon_rate: bitrate to be used for beacons * * These parameters are fixed when the mesh is created. */ @@ -1413,6 +1414,7 @@ struct mesh_setup { u16 beacon_interval; int mcast_rate[IEEE80211_NUM_BANDS]; u32 basic_rates; + struct cfg80211_bitrate_mask beacon_rate; }; /** |