diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-12 18:46:58 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-12 18:46:58 +0300 |
| commit | 7fd38193d0473acc6e8f108107d0466f07768853 (patch) | |
| tree | 076f5d81a643c818dcf6561dad0f3d75d1049dc5 /Documentation | |
| parent | 488992916c50890fbe5e7057e29681a4c4fdf1f8 (diff) | |
| parent | 46fa38e84b656f80edf83d21144221b0cad18d61 (diff) | |
| download | linux-7fd38193d0473acc6e8f108107d0466f07768853.tar.xz | |
Merge tag 'mac80211-next-for-davem-2016-05-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Some more work for 4.7, notably:
* completion and fixups of nla_put_64_64bit() work
* remove a/b/g/n from wext nickname to avoid confusion
with 11ac (which wouldn't even fit fully there due to
string length restrictions)
along with some other minor changes/cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/80211.tmpl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl index f2a312b35875..5f7c55999c77 100644 --- a/Documentation/DocBook/80211.tmpl +++ b/Documentation/DocBook/80211.tmpl @@ -135,6 +135,7 @@ !Finclude/net/cfg80211.h cfg80211_tx_mlme_mgmt !Finclude/net/cfg80211.h cfg80211_ibss_joined !Finclude/net/cfg80211.h cfg80211_connect_result +!Finclude/net/cfg80211.h cfg80211_connect_bss !Finclude/net/cfg80211.h cfg80211_roamed !Finclude/net/cfg80211.h cfg80211_disconnected !Finclude/net/cfg80211.h cfg80211_ready_on_channel |