Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Browse files Browse the repository at this point in the history
Mostly simple overlapping changes.

For example, David Ahern's adjacency list revamp in 'net-next'
conflicted with an adjacency list traversal bug fix in 'net'.

Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
davem330 committed Oct 30, 2016
2 parents 357f4aa + 2a26d99 commit 27058af
Show file tree
Hide file tree
Showing 1,707 changed files with 35,360 additions and 13,824 deletions.
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ Peter Oruba <[email protected]>
Peter Oruba <[email protected]>
Pratyush Anand <[email protected]> <[email protected]>
Praveen BP <[email protected]>
Qais Yousef <[email protected]> <[email protected]>
Rajesh Shah <[email protected]>
Ralf Baechle <[email protected]>
Ralf Wildenhues <[email protected]>
Expand Down
5 changes: 3 additions & 2 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -1864,10 +1864,11 @@ S: The Netherlands

N: Martin Kepplinger
E: [email protected]
E: martin.kepplinger@theobroma-systems.com
E: martin.kepplinger@ginzinger.com
W: http://www.martinkepplinger.com
D: mma8452 accelerators iio driver
D: Kernel cleanups
D: pegasus_notetaker input driver
D: Kernel fixes and cleanups
S: Garnisonstraße 26
S: 4020 Linz
S: Austria
Expand Down
3 changes: 2 additions & 1 deletion Documentation/00-INDEX
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ IRQ.txt
Intel-IOMMU.txt
- basic info on the Intel IOMMU virtualization support.
Makefile
- some files in Documentation dir are actually sample code to build
- This file does nothing. Removing it breaks make htmldocs and
make distclean.
ManagementStyle
- how to (attempt to) manage kernel hackers.
RCU/
Expand Down
345 changes: 345 additions & 0 deletions Documentation/80211/cfg80211.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,345 @@
==================
cfg80211 subsystem
==================

Device registration
===================

.. kernel-doc:: include/net/cfg80211.h
:doc: Device registration

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_channel_flags

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_channel

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_rate_flags

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_rate

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_sta_ht_cap

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_supported_band

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_signal_type

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_params_flags

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_flags

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy

.. kernel-doc:: include/net/cfg80211.h
:functions: wireless_dev

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_new

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_register

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_unregister

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_free

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_name

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_dev

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_priv

.. kernel-doc:: include/net/cfg80211.h
:functions: priv_to_wiphy

.. kernel-doc:: include/net/cfg80211.h
:functions: set_wiphy_dev

.. kernel-doc:: include/net/cfg80211.h
:functions: wdev_priv

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_iface_limit

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_iface_combination

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_check_combinations

Actions and configuration
=========================

.. kernel-doc:: include/net/cfg80211.h
:doc: Actions and configuration

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_ops

.. kernel-doc:: include/net/cfg80211.h
:functions: vif_params

.. kernel-doc:: include/net/cfg80211.h
:functions: key_params

.. kernel-doc:: include/net/cfg80211.h
:functions: survey_info_flags

.. kernel-doc:: include/net/cfg80211.h
:functions: survey_info

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_beacon_data

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_ap_settings

.. kernel-doc:: include/net/cfg80211.h
:functions: station_parameters

.. kernel-doc:: include/net/cfg80211.h
:functions: rate_info_flags

.. kernel-doc:: include/net/cfg80211.h
:functions: rate_info

.. kernel-doc:: include/net/cfg80211.h
:functions: station_info

.. kernel-doc:: include/net/cfg80211.h
:functions: monitor_flags

.. kernel-doc:: include/net/cfg80211.h
:functions: mpath_info_flags

.. kernel-doc:: include/net/cfg80211.h
:functions: mpath_info

.. kernel-doc:: include/net/cfg80211.h
:functions: bss_parameters

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_txq_params

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_crypto_settings

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_auth_request

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_assoc_request

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_deauth_request

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_disassoc_request

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_ibss_params

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_connect_params

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_pmksa

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_rx_mlme_mgmt

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_auth_timeout

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_rx_assoc_resp

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_assoc_timeout

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_tx_mlme_mgmt

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_ibss_joined

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_connect_result

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_connect_bss

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_connect_timeout

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_roamed

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_disconnected

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_ready_on_channel

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_remain_on_channel_expired

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_new_sta

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_rx_mgmt

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_mgmt_tx_status

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_cqm_rssi_notify

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_cqm_pktloss_notify

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_michael_mic_failure

Scanning and BSS list handling
==============================

.. kernel-doc:: include/net/cfg80211.h
:doc: Scanning and BSS list handling

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_ssid

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_scan_request

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_scan_done

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_bss

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_inform_bss

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_inform_bss_frame_data

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_inform_bss_data

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_unlink_bss

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_find_ie

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_bss_get_ie

Utility functions
=================

.. kernel-doc:: include/net/cfg80211.h
:doc: Utility functions

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_channel_to_frequency

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_frequency_to_channel

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_get_channel

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_get_response_rate

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_hdrlen

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_get_hdrlen_from_skb

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_radiotap_iterator

Data path helpers
=================

.. kernel-doc:: include/net/cfg80211.h
:doc: Data path helpers

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_data_to_8023

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_data_from_8023

.. kernel-doc:: include/net/cfg80211.h
:functions: ieee80211_amsdu_to_8023s

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_classify8021d

Regulatory enforcement infrastructure
=====================================

.. kernel-doc:: include/net/cfg80211.h
:doc: Regulatory enforcement infrastructure

.. kernel-doc:: include/net/cfg80211.h
:functions: regulatory_hint

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_apply_custom_regulatory

.. kernel-doc:: include/net/cfg80211.h
:functions: freq_reg_info

RFkill integration
==================

.. kernel-doc:: include/net/cfg80211.h
:doc: RFkill integration

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_rfkill_set_hw_state

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_rfkill_start_polling

.. kernel-doc:: include/net/cfg80211.h
:functions: wiphy_rfkill_stop_polling

Test mode
=========

.. kernel-doc:: include/net/cfg80211.h
:doc: Test mode

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_testmode_alloc_reply_skb

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_testmode_reply

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_testmode_alloc_event_skb

.. kernel-doc:: include/net/cfg80211.h
:functions: cfg80211_testmode_event
5 changes: 5 additions & 0 deletions Documentation/80211/conf.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# -*- coding: utf-8; mode: python -*-

project = "Linux 802.11 Driver Developer's Guide"

tags.add("subproject")
Loading

0 comments on commit 27058af

Please sign in to comment.