diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-14 18:00:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-14 18:00:48 -0400 |
| commit | c597f6653d5734c11b1e3217c7619a37e96e5a1f (patch) | |
| tree | 2c24b46bbe265f3284dcec0a001f7af498794964 /include/linux | |
| parent | 669d67bf777def468970f2dcba1537edf3b2d329 (diff) | |
| parent | 341352d13dae752610342923c53ebe461624ee2c (diff) | |
| download | linux-3.10-c597f6653d5734c11b1e3217c7619a37e96e5a1f.tar.gz linux-3.10-c597f6653d5734c11b1e3217c7619a37e96e5a1f.tar.bz2 linux-3.10-c597f6653d5734c11b1e3217c7619a37e96e5a1f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nl80211.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/nl80211.h b/include/linux/nl80211.h index 1335084b1c6..2540e86d99a 100644 --- a/include/linux/nl80211.h +++ b/include/linux/nl80211.h @@ -2154,6 +2154,8 @@ enum nl80211_mntr_flags { * @NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR: maximum number of neighbors * to synchronize to for 11s default synchronization method (see 11C.12.2.2) * + * @NL80211_MESHCONF_HT_OPMODE: set mesh HT protection mode. + * * @__NL80211_MESHCONF_ATTR_AFTER_LAST: internal use */ enum nl80211_meshconf_params { @@ -2179,6 +2181,7 @@ enum nl80211_meshconf_params { NL80211_MESHCONF_FORWARDING, NL80211_MESHCONF_RSSI_THRESHOLD, NL80211_MESHCONF_SYNC_OFFSET_MAX_NEIGHBOR, + NL80211_MESHCONF_HT_OPMODE, /* keep last */ __NL80211_MESHCONF_ATTR_AFTER_LAST, |