Skip to content

Commit 27058af

Browse files
davem330davem330
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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 <davem@davemloft.net>
2 parents 357f4aa + 2a26d99 commit 27058af

File tree

1,707 files changed

+35360
-13824
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,707 files changed

+35360
-13824
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ Peter Oruba <peter@oruba.de>
127127
Peter Oruba <peter.oruba@amd.com>
128128
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
129129
Praveen BP <praveenbp@ti.com>
130+
Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
130131
Rajesh Shah <rajesh.shah@intel.com>
131132
Ralf Baechle <ralf@linux-mips.org>
132133
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

‎CREDITS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1864,10 +1864,11 @@ S: The Netherlands
18641864

18651865
N: Martin Kepplinger
18661866
E: martink@posteo.de
1867-
E: martin.kepplinger@theobroma-systems.com
1867+
E: martin.kepplinger@ginzinger.com
18681868
W: http://www.martinkepplinger.com
18691869
D: mma8452 accelerators iio driver
1870-
D: Kernel cleanups
1870+
D: pegasus_notetaker input driver
1871+
D: Kernel fixes and cleanups
18711872
S: Garnisonstraße 26
18721873
S: 4020 Linz
18731874
S: Austria

‎Documentation/00-INDEX

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ IRQ.txt
4646
Intel-IOMMU.txt
4747
- basic info on the Intel IOMMU virtualization support.
4848
Makefile
49-
- some files in Documentation dir are actually sample code to build
49+
- This file does nothing. Removing it breaks make htmldocs and
50+
make distclean.
5051
ManagementStyle
5152
- how to (attempt to) manage kernel hackers.
5253
RCU/

‎Documentation/80211/cfg80211.rst

Lines changed: 345 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,345 @@
1+
==================
2+
cfg80211 subsystem
3+
==================
4+
5+
Device registration
6+
===================
7+
8+
.. kernel-doc:: include/net/cfg80211.h
9+
:doc: Device registration
10+
11+
.. kernel-doc:: include/net/cfg80211.h
12+
:functions: ieee80211_channel_flags
13+
14+
.. kernel-doc:: include/net/cfg80211.h
15+
:functions: ieee80211_channel
16+
17+
.. kernel-doc:: include/net/cfg80211.h
18+
:functions: ieee80211_rate_flags
19+
20+
.. kernel-doc:: include/net/cfg80211.h
21+
:functions: ieee80211_rate
22+
23+
.. kernel-doc:: include/net/cfg80211.h
24+
:functions: ieee80211_sta_ht_cap
25+
26+
.. kernel-doc:: include/net/cfg80211.h
27+
:functions: ieee80211_supported_band
28+
29+
.. kernel-doc:: include/net/cfg80211.h
30+
:functions: cfg80211_signal_type
31+
32+
.. kernel-doc:: include/net/cfg80211.h
33+
:functions: wiphy_params_flags
34+
35+
.. kernel-doc:: include/net/cfg80211.h
36+
:functions: wiphy_flags
37+
38+
.. kernel-doc:: include/net/cfg80211.h
39+
:functions: wiphy
40+
41+
.. kernel-doc:: include/net/cfg80211.h
42+
:functions: wireless_dev
43+
44+
.. kernel-doc:: include/net/cfg80211.h
45+
:functions: wiphy_new
46+
47+
.. kernel-doc:: include/net/cfg80211.h
48+
:functions: wiphy_register
49+
50+
.. kernel-doc:: include/net/cfg80211.h
51+
:functions: wiphy_unregister
52+
53+
.. kernel-doc:: include/net/cfg80211.h
54+
:functions: wiphy_free
55+
56+
.. kernel-doc:: include/net/cfg80211.h
57+
:functions: wiphy_name
58+
59+
.. kernel-doc:: include/net/cfg80211.h
60+
:functions: wiphy_dev
61+
62+
.. kernel-doc:: include/net/cfg80211.h
63+
:functions: wiphy_priv
64+
65+
.. kernel-doc:: include/net/cfg80211.h
66+
:functions: priv_to_wiphy
67+
68+
.. kernel-doc:: include/net/cfg80211.h
69+
:functions: set_wiphy_dev
70+
71+
.. kernel-doc:: include/net/cfg80211.h
72+
:functions: wdev_priv
73+
74+
.. kernel-doc:: include/net/cfg80211.h
75+
:functions: ieee80211_iface_limit
76+
77+
.. kernel-doc:: include/net/cfg80211.h
78+
:functions: ieee80211_iface_combination
79+
80+
.. kernel-doc:: include/net/cfg80211.h
81+
:functions: cfg80211_check_combinations
82+
83+
Actions and configuration
84+
=========================
85+
86+
.. kernel-doc:: include/net/cfg80211.h
87+
:doc: Actions and configuration
88+
89+
.. kernel-doc:: include/net/cfg80211.h
90+
:functions: cfg80211_ops
91+
92+
.. kernel-doc:: include/net/cfg80211.h
93+
:functions: vif_params
94+
95+
.. kernel-doc:: include/net/cfg80211.h
96+
:functions: key_params
97+
98+
.. kernel-doc:: include/net/cfg80211.h
99+
:functions: survey_info_flags
100+
101+
.. kernel-doc:: include/net/cfg80211.h
102+
:functions: survey_info
103+
104+
.. kernel-doc:: include/net/cfg80211.h
105+
:functions: cfg80211_beacon_data
106+
107+
.. kernel-doc:: include/net/cfg80211.h
108+
:functions: cfg80211_ap_settings
109+
110+
.. kernel-doc:: include/net/cfg80211.h
111+
:functions: station_parameters
112+
113+
.. kernel-doc:: include/net/cfg80211.h
114+
:functions: rate_info_flags
115+
116+
.. kernel-doc:: include/net/cfg80211.h
117+
:functions: rate_info
118+
119+
.. kernel-doc:: include/net/cfg80211.h
120+
:functions: station_info
121+
122+
.. kernel-doc:: include/net/cfg80211.h
123+
:functions: monitor_flags
124+
125+
.. kernel-doc:: include/net/cfg80211.h
126+
:functions: mpath_info_flags
127+
128+
.. kernel-doc:: include/net/cfg80211.h
129+
:functions: mpath_info
130+
131+
.. kernel-doc:: include/net/cfg80211.h
132+
:functions: bss_parameters
133+
134+
.. kernel-doc:: include/net/cfg80211.h
135+
:functions: ieee80211_txq_params
136+
137+
.. kernel-doc:: include/net/cfg80211.h
138+
:functions: cfg80211_crypto_settings
139+
140+
.. kernel-doc:: include/net/cfg80211.h
141+
:functions: cfg80211_auth_request
142+
143+
.. kernel-doc:: include/net/cfg80211.h
144+
:functions: cfg80211_assoc_request
145+
146+
.. kernel-doc:: include/net/cfg80211.h
147+
:functions: cfg80211_deauth_request
148+
149+
.. kernel-doc:: include/net/cfg80211.h
150+
:functions: cfg80211_disassoc_request
151+
152+
.. kernel-doc:: include/net/cfg80211.h
153+
:functions: cfg80211_ibss_params
154+
155+
.. kernel-doc:: include/net/cfg80211.h
156+
:functions: cfg80211_connect_params
157+
158+
.. kernel-doc:: include/net/cfg80211.h
159+
:functions: cfg80211_pmksa
160+
161+
.. kernel-doc:: include/net/cfg80211.h
162+
:functions: cfg80211_rx_mlme_mgmt
163+
164+
.. kernel-doc:: include/net/cfg80211.h
165+
:functions: cfg80211_auth_timeout
166+
167+
.. kernel-doc:: include/net/cfg80211.h
168+
:functions: cfg80211_rx_assoc_resp
169+
170+
.. kernel-doc:: include/net/cfg80211.h
171+
:functions: cfg80211_assoc_timeout
172+
173+
.. kernel-doc:: include/net/cfg80211.h
174+
:functions: cfg80211_tx_mlme_mgmt
175+
176+
.. kernel-doc:: include/net/cfg80211.h
177+
:functions: cfg80211_ibss_joined
178+
179+
.. kernel-doc:: include/net/cfg80211.h
180+
:functions: cfg80211_connect_result
181+
182+
.. kernel-doc:: include/net/cfg80211.h
183+
:functions: cfg80211_connect_bss
184+
185+
.. kernel-doc:: include/net/cfg80211.h
186+
:functions: cfg80211_connect_timeout
187+
188+
.. kernel-doc:: include/net/cfg80211.h
189+
:functions: cfg80211_roamed
190+
191+
.. kernel-doc:: include/net/cfg80211.h
192+
:functions: cfg80211_disconnected
193+
194+
.. kernel-doc:: include/net/cfg80211.h
195+
:functions: cfg80211_ready_on_channel
196+
197+
.. kernel-doc:: include/net/cfg80211.h
198+
:functions: cfg80211_remain_on_channel_expired
199+
200+
.. kernel-doc:: include/net/cfg80211.h
201+
:functions: cfg80211_new_sta
202+
203+
.. kernel-doc:: include/net/cfg80211.h
204+
:functions: cfg80211_rx_mgmt
205+
206+
.. kernel-doc:: include/net/cfg80211.h
207+
:functions: cfg80211_mgmt_tx_status
208+
209+
.. kernel-doc:: include/net/cfg80211.h
210+
:functions: cfg80211_cqm_rssi_notify
211+
212+
.. kernel-doc:: include/net/cfg80211.h
213+
:functions: cfg80211_cqm_pktloss_notify
214+
215+
.. kernel-doc:: include/net/cfg80211.h
216+
:functions: cfg80211_michael_mic_failure
217+
218+
Scanning and BSS list handling
219+
==============================
220+
221+
.. kernel-doc:: include/net/cfg80211.h
222+
:doc: Scanning and BSS list handling
223+
224+
.. kernel-doc:: include/net/cfg80211.h
225+
:functions: cfg80211_ssid
226+
227+
.. kernel-doc:: include/net/cfg80211.h
228+
:functions: cfg80211_scan_request
229+
230+
.. kernel-doc:: include/net/cfg80211.h
231+
:functions: cfg80211_scan_done
232+
233+
.. kernel-doc:: include/net/cfg80211.h
234+
:functions: cfg80211_bss
235+
236+
.. kernel-doc:: include/net/cfg80211.h
237+
:functions: cfg80211_inform_bss
238+
239+
.. kernel-doc:: include/net/cfg80211.h
240+
:functions: cfg80211_inform_bss_frame_data
241+
242+
.. kernel-doc:: include/net/cfg80211.h
243+
:functions: cfg80211_inform_bss_data
244+
245+
.. kernel-doc:: include/net/cfg80211.h
246+
:functions: cfg80211_unlink_bss
247+
248+
.. kernel-doc:: include/net/cfg80211.h
249+
:functions: cfg80211_find_ie
250+
251+
.. kernel-doc:: include/net/cfg80211.h
252+
:functions: ieee80211_bss_get_ie
253+
254+
Utility functions
255+
=================
256+
257+
.. kernel-doc:: include/net/cfg80211.h
258+
:doc: Utility functions
259+
260+
.. kernel-doc:: include/net/cfg80211.h
261+
:functions: ieee80211_channel_to_frequency
262+
263+
.. kernel-doc:: include/net/cfg80211.h
264+
:functions: ieee80211_frequency_to_channel
265+
266+
.. kernel-doc:: include/net/cfg80211.h
267+
:functions: ieee80211_get_channel
268+
269+
.. kernel-doc:: include/net/cfg80211.h
270+
:functions: ieee80211_get_response_rate
271+
272+
.. kernel-doc:: include/net/cfg80211.h
273+
:functions: ieee80211_hdrlen
274+
275+
.. kernel-doc:: include/net/cfg80211.h
276+
:functions: ieee80211_get_hdrlen_from_skb
277+
278+
.. kernel-doc:: include/net/cfg80211.h
279+
:functions: ieee80211_radiotap_iterator
280+
281+
Data path helpers
282+
=================
283+
284+
.. kernel-doc:: include/net/cfg80211.h
285+
:doc: Data path helpers
286+
287+
.. kernel-doc:: include/net/cfg80211.h
288+
:functions: ieee80211_data_to_8023
289+
290+
.. kernel-doc:: include/net/cfg80211.h
291+
:functions: ieee80211_data_from_8023
292+
293+
.. kernel-doc:: include/net/cfg80211.h
294+
:functions: ieee80211_amsdu_to_8023s
295+
296+
.. kernel-doc:: include/net/cfg80211.h
297+
:functions: cfg80211_classify8021d
298+
299+
Regulatory enforcement infrastructure
300+
=====================================
301+
302+
.. kernel-doc:: include/net/cfg80211.h
303+
:doc: Regulatory enforcement infrastructure
304+
305+
.. kernel-doc:: include/net/cfg80211.h
306+
:functions: regulatory_hint
307+
308+
.. kernel-doc:: include/net/cfg80211.h
309+
:functions: wiphy_apply_custom_regulatory
310+
311+
.. kernel-doc:: include/net/cfg80211.h
312+
:functions: freq_reg_info
313+
314+
RFkill integration
315+
==================
316+
317+
.. kernel-doc:: include/net/cfg80211.h
318+
:doc: RFkill integration
319+
320+
.. kernel-doc:: include/net/cfg80211.h
321+
:functions: wiphy_rfkill_set_hw_state
322+
323+
.. kernel-doc:: include/net/cfg80211.h
324+
:functions: wiphy_rfkill_start_polling
325+
326+
.. kernel-doc:: include/net/cfg80211.h
327+
:functions: wiphy_rfkill_stop_polling
328+
329+
Test mode
330+
=========
331+
332+
.. kernel-doc:: include/net/cfg80211.h
333+
:doc: Test mode
334+
335+
.. kernel-doc:: include/net/cfg80211.h
336+
:functions: cfg80211_testmode_alloc_reply_skb
337+
338+
.. kernel-doc:: include/net/cfg80211.h
339+
:functions: cfg80211_testmode_reply
340+
341+
.. kernel-doc:: include/net/cfg80211.h
342+
:functions: cfg80211_testmode_alloc_event_skb
343+
344+
.. kernel-doc:: include/net/cfg80211.h
345+
:functions: cfg80211_testmode_event

‎Documentation/80211/conf.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# -*- coding: utf-8; mode: python -*-
2+
3+
project = "Linux 802.11 Driver Developer's Guide"
4+
5+
tags.add("subproject")

0 commit comments

Comments
 (0)