Skip to content

Commit fee1cc0

Browse files
hormshorms
committed
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into HEAD
2 parents ae90bde + 0c21e3a commit fee1cc0

File tree

5,217 files changed

+320267
-168056
lines changed

Some content is hidden

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

5,217 files changed

+320267
-168056
lines changed

‎.mailmap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,3 +105,4 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
105105
Uwe Kleine-König <ukl@pengutronix.de>
106106
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
107107
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
108+
Takashi YOSHII <takashi.yoshii.zj@renesas.com>

‎CREDITS‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2365,8 +2365,6 @@ E: acme@redhat.com
23652365
W: http://oops.ghostprotocols.net:81/blog/
23662366
P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
23672367
D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
2368-
S: R. Brasílio Itiberê, 4270/1010 - Água Verde
2369-
S: 80240-060 - Curitiba - Paraná
23702368
S: Brazil
23712369

23722370
N: Karsten Merker

‎Documentation/ABI/obsolete/proc-pid-oom_adj‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
What: /proc/<pid>/oom_adj
2+
When: August 2012
3+
Why: /proc/<pid>/oom_adj allows userspace to influence the oom killer's
4+
badness heuristic used to determine which task to kill when the kernel
5+
is out of memory.
6+
7+
The badness heuristic has since been rewritten since the introduction of
8+
this tunable such that its meaning is deprecated. The value was
9+
implemented as a bitshift on a score generated by the badness()
10+
function that did not have any precise units of measure. With the
11+
rewrite, the score is given as a proportion of available memory to the
12+
task allocating pages, so using a bitshift which grows the score
13+
exponentially is, thus, impossible to tune with fine granularity.
14+
15+
A much more powerful interface, /proc/<pid>/oom_score_adj, was
16+
introduced with the oom killer rewrite that allows users to increase or
17+
decrease the badness() score linearly. This interface will replace
18+
/proc/<pid>/oom_adj.
19+
20+
A warning will be emitted to the kernel log if an application uses this
21+
deprecated interface. After it is printed once, future warnings will be
22+
suppressed until the kernel is rebooted.

‎Documentation/ABI/testing/sysfs-bus-rbd‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
What: /sys/bus/rbd/
2+
Date: November 2010
3+
Contact: Yehuda Sadeh <yehuda@hq.newdream.net>,
4+
Sage Weil <sage@newdream.net>
5+
Description:
6+
7+
Being used for adding and removing rbd block devices.
8+
9+
Usage: <mon ip addr> <options> <pool name> <rbd image name> [snap name]
10+
11+
$ echo "192.168.0.1 name=admin rbd foo" > /sys/bus/rbd/add
12+
13+
The snapshot name can be "-" or omitted to map the image read/write. A <dev-id>
14+
will be assigned for any registered block device. If snapshot is used, it will
15+
be mapped read-only.
16+
17+
Removal of a device:
18+
19+
$ echo <dev-id> > /sys/bus/rbd/remove
20+
21+
Entries under /sys/bus/rbd/devices/<dev-id>/
22+
--------------------------------------------
23+
24+
client_id
25+
26+
The ceph unique client id that was assigned for this specific session.
27+
28+
major
29+
30+
The block device major number.
31+
32+
name
33+
34+
The name of the rbd image.
35+
36+
pool
37+
38+
The pool where this rbd image resides. The pool-name pair is unique
39+
per rados system.
40+
41+
size
42+
43+
The size (in bytes) of the mapped block device.
44+
45+
refresh
46+
47+
Writing to this file will reread the image header data and set
48+
all relevant datastructures accordingly.
49+
50+
current_snap
51+
52+
The current snapshot for which the device is mapped.
53+
54+
create_snap
55+
56+
Create a snapshot:
57+
58+
$ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create
59+
60+
rollback_snap
61+
62+
Rolls back data to the specified snapshot. This goes over the entire
63+
list of rados blocks and sends a rollback command to each.
64+
65+
$ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback
66+
67+
snap_*
68+
69+
A directory per each snapshot
70+
71+
72+
Entries under /sys/bus/rbd/devices/<dev-id>/snap_<snap-name>
73+
-------------------------------------------------------------
74+
75+
id
76+
77+
The rados internal snapshot id assigned for this snapshot
78+
79+
size
80+
81+
The size of the image when this snapshot was taken.
82+
83+

‎Documentation/ABI/testing/sysfs-class-net-batman-adv‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
What: /sys/class/net/<iface>/batman-adv/mesh_iface
3+
Date: May 2010
4+
Contact: Marek Lindner <lindner_marek@yahoo.de>
5+
Description:
6+
The /sys/class/net/<iface>/batman-adv/mesh_iface file
7+
displays the batman mesh interface this <iface>
8+
currently is associated with.
9+
10+
What: /sys/class/net/<iface>/batman-adv/iface_status
11+
Date: May 2010
12+
Contact: Marek Lindner <lindner_marek@yahoo.de>
13+
Description:
14+
Indicates the status of <iface> as it is seen by batman.

‎Documentation/ABI/testing/sysfs-class-net-mesh‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
2+
What: /sys/class/net/<mesh_iface>/mesh/aggregated_ogms
3+
Date: May 2010
4+
Contact: Marek Lindner <lindner_marek@yahoo.de>
5+
Description:
6+
Indicates whether the batman protocol messages of the
7+
mesh <mesh_iface> shall be aggregated or not.
8+
9+
What: /sys/class/net/<mesh_iface>/mesh/bonding
10+
Date: June 2010
11+
Contact: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
12+
Description:
13+
Indicates whether the data traffic going through the
14+
mesh will be sent using multiple interfaces at the
15+
same time (if available).
16+
17+
What: /sys/class/net/<mesh_iface>/mesh/fragmentation
18+
Date: October 2010
19+
Contact: Andreas Langer <an.langer@gmx.de>
20+
Description:
21+
Indicates whether the data traffic going through the
22+
mesh will be fragmented or silently discarded if the
23+
packet size exceeds the outgoing interface MTU.
24+
25+
What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth
26+
Date: October 2010
27+
Contact: Marek Lindner <lindner_marek@yahoo.de>
28+
Description:
29+
Defines the bandwidth which is propagated by this
30+
node if gw_mode was set to 'server'.
31+
32+
What: /sys/class/net/<mesh_iface>/mesh/gw_mode
33+
Date: October 2010
34+
Contact: Marek Lindner <lindner_marek@yahoo.de>
35+
Description:
36+
Defines the state of the gateway features. Can be
37+
either 'off', 'client' or 'server'.
38+
39+
What: /sys/class/net/<mesh_iface>/mesh/gw_sel_class
40+
Date: October 2010
41+
Contact: Marek Lindner <lindner_marek@yahoo.de>
42+
Description:
43+
Defines the selection criteria this node will use
44+
to choose a gateway if gw_mode was set to 'client'.
45+
46+
What: /sys/class/net/<mesh_iface>/mesh/orig_interval
47+
Date: May 2010
48+
Contact: Marek Lindner <lindner_marek@yahoo.de>
49+
Description:
50+
Defines the interval in milliseconds in which batman
51+
sends its protocol messages.
52+
53+
What: /sys/class/net/<mesh_iface>/mesh/hop_penalty
54+
Date: Oct 2010
55+
Contact: Linus Lüssing <linus.luessing@web.de>
56+
Description:
57+
Defines the penalty which will be applied to an
58+
originator message's tq-field on every hop.
59+
60+
What: /sys/class/net/<mesh_iface>/mesh/vis_mode
61+
Date: May 2010
62+
Contact: Marek Lindner <lindner_marek@yahoo.de>
63+
Description:
64+
Each batman node only maintains information about its
65+
own local neighborhood, therefore generating graphs
66+
showing the topology of the entire mesh is not easily
67+
feasible without having a central instance to collect
68+
the local topologies from all nodes. This file allows
69+
to activate the collecting (server) mode.

‎Documentation/ABI/testing/sysfs-platform-asus-laptop‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,20 @@ Date: January 2007
4747
KernelVersion: 2.6.20
4848
Contact: "Corentin Chary" <corentincj@iksaif.net>
4949
Description:
50-
Control the bluetooth device. 1 means on, 0 means off.
50+
Control the wlan device. 1 means on, 0 means off.
5151
This may control the led, the device or both.
5252
Users: Lapsus
53+
54+
What: /sys/devices/platform/asus_laptop/wimax
55+
Date: October 2010
56+
KernelVersion: 2.6.37
57+
Contact: "Corentin Chary" <corentincj@iksaif.net>
58+
Description:
59+
Control the wimax device. 1 means on, 0 means off.
60+
61+
What: /sys/devices/platform/asus_laptop/wwan
62+
Date: October 2010
63+
KernelVersion: 2.6.37
64+
Contact: "Corentin Chary" <corentincj@iksaif.net>
65+
Description:
66+
Control the wwan (3G) device. 1 means on, 0 means off.

‎Documentation/ABI/testing/sysfs-platform-eeepc-wmi‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
What: /sys/devices/platform/eeepc-wmi/cpufv
2+
Date: Oct 2010
3+
KernelVersion: 2.6.37
4+
Contact: "Corentin Chary" <corentincj@iksaif.net>
5+
Description:
6+
Change CPU clock configuration (write-only).
7+
There are three available clock configuration:
8+
* 0 -> Super Performance Mode
9+
* 1 -> High Performance Mode
10+
* 2 -> Power Saving Mode

‎Documentation/ABI/testing/sysfs-tty‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
What: /sys/class/tty/console/active
2+
Date: Nov 2010
3+
Contact: Kay Sievers <kay.sievers@vrfy.org>
4+
Description:
5+
Shows the list of currently configured
6+
console devices, like 'tty1 ttyS0'.
7+
The last entry in the file is the active
8+
device connected to /dev/console.
9+
The file supports poll() to detect virtual
10+
console switches.
11+
12+
What: /sys/class/tty/tty0/active
13+
Date: Nov 2010
14+
Contact: Kay Sievers <kay.sievers@vrfy.org>
15+
Description:
16+
Shows the currently active virtual console
17+
device, like 'tty1'.
18+
The file supports poll() to detect virtual
19+
console switches.

‎Documentation/DocBook/80211.tmpl‎

Lines changed: 68 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@
146146
!Finclude/net/cfg80211.h cfg80211_rx_mgmt
147147
!Finclude/net/cfg80211.h cfg80211_mgmt_tx_status
148148
!Finclude/net/cfg80211.h cfg80211_cqm_rssi_notify
149+
!Finclude/net/cfg80211.h cfg80211_cqm_pktloss_notify
149150
!Finclude/net/cfg80211.h cfg80211_michael_mic_failure
150151
</chapter>
151152
<chapter>
@@ -332,10 +333,16 @@
332333
<title>functions/definitions</title>
333334
!Finclude/net/mac80211.h ieee80211_rx_status
334335
!Finclude/net/mac80211.h mac80211_rx_flags
336+
!Finclude/net/mac80211.h mac80211_tx_control_flags
337+
!Finclude/net/mac80211.h mac80211_rate_control_flags
338+
!Finclude/net/mac80211.h ieee80211_tx_rate
335339
!Finclude/net/mac80211.h ieee80211_tx_info
340+
!Finclude/net/mac80211.h ieee80211_tx_info_clear_status
336341
!Finclude/net/mac80211.h ieee80211_rx
342+
!Finclude/net/mac80211.h ieee80211_rx_ni
337343
!Finclude/net/mac80211.h ieee80211_rx_irqsafe
338344
!Finclude/net/mac80211.h ieee80211_tx_status
345+
!Finclude/net/mac80211.h ieee80211_tx_status_ni
339346
!Finclude/net/mac80211.h ieee80211_tx_status_irqsafe
340347
!Finclude/net/mac80211.h ieee80211_rts_get
341348
!Finclude/net/mac80211.h ieee80211_rts_duration
@@ -346,6 +353,7 @@
346353
!Finclude/net/mac80211.h ieee80211_stop_queue
347354
!Finclude/net/mac80211.h ieee80211_wake_queues
348355
!Finclude/net/mac80211.h ieee80211_stop_queues
356+
!Finclude/net/mac80211.h ieee80211_queue_stopped
349357
</sect1>
350358
</chapter>
351359

@@ -354,6 +362,13 @@
354362
!Pinclude/net/mac80211.h Frame filtering
355363
!Finclude/net/mac80211.h ieee80211_filter_flags
356364
</chapter>
365+
366+
<chapter id="workqueue">
367+
<title>The mac80211 workqueue</title>
368+
!Pinclude/net/mac80211.h mac80211 workqueue
369+
!Finclude/net/mac80211.h ieee80211_queue_work
370+
!Finclude/net/mac80211.h ieee80211_queue_delayed_work
371+
</chapter>
357372
</part>
358373

359374
<part id="advanced">
@@ -374,6 +389,9 @@
374389
!Finclude/net/mac80211.h set_key_cmd
375390
!Finclude/net/mac80211.h ieee80211_key_conf
376391
!Finclude/net/mac80211.h ieee80211_key_flags
392+
!Finclude/net/mac80211.h ieee80211_tkip_key_type
393+
!Finclude/net/mac80211.h ieee80211_get_tkip_key
394+
!Finclude/net/mac80211.h ieee80211_key_removed
377395
</chapter>
378396

379397
<chapter id="powersave">
@@ -417,13 +435,47 @@
417435
supported by mac80211, add notes about supporting hw crypto
418436
with it.
419437
</para>
438+
!Finclude/net/mac80211.h ieee80211_iterate_active_interfaces
439+
!Finclude/net/mac80211.h ieee80211_iterate_active_interfaces_atomic
440+
</chapter>
441+
442+
<chapter id="station-handling">
443+
<title>Station handling</title>
444+
<para>TODO</para>
445+
!Finclude/net/mac80211.h ieee80211_sta
446+
!Finclude/net/mac80211.h sta_notify_cmd
447+
!Finclude/net/mac80211.h ieee80211_find_sta
448+
!Finclude/net/mac80211.h ieee80211_find_sta_by_ifaddr
449+
!Finclude/net/mac80211.h ieee80211_sta_block_awake
420450
</chapter>
421451

422452
<chapter id="hardware-scan-offload">
423453
<title>Hardware scan offload</title>
424454
<para>TBD</para>
425455
!Finclude/net/mac80211.h ieee80211_scan_completed
426456
</chapter>
457+
458+
<chapter id="aggregation">
459+
<title>Aggregation</title>
460+
<sect1>
461+
<title>TX A-MPDU aggregation</title>
462+
!Pnet/mac80211/agg-tx.c TX A-MPDU aggregation
463+
!Cnet/mac80211/agg-tx.c
464+
</sect1>
465+
<sect1>
466+
<title>RX A-MPDU aggregation</title>
467+
!Pnet/mac80211/agg-rx.c RX A-MPDU aggregation
468+
!Cnet/mac80211/agg-rx.c
469+
</sect1>
470+
!Finclude/net/mac80211.h ieee80211_ampdu_mlme_action
471+
</chapter>
472+
473+
<chapter id="smps">
474+
<title>Spatial Multiplexing Powersave (SMPS)</title>
475+
!Pinclude/net/mac80211.h Spatial multiplexing power save
476+
!Finclude/net/mac80211.h ieee80211_request_smps
477+
!Finclude/net/mac80211.h ieee80211_smps_mode
478+
</chapter>
427479
</part>
428480

429481
<part id="rate-control">
@@ -435,9 +487,16 @@
435487
interface and how it relates to mac80211 and drivers.
436488
</para>
437489
</partintro>
438-
<chapter id="dummy">
439-
<title>dummy chapter</title>
490+
<chapter id="ratecontrol-api">
491+
<title>Rate Control API</title>
440492
<para>TBD</para>
493+
!Finclude/net/mac80211.h ieee80211_start_tx_ba_session
494+
!Finclude/net/mac80211.h ieee80211_start_tx_ba_cb_irqsafe
495+
!Finclude/net/mac80211.h ieee80211_stop_tx_ba_session
496+
!Finclude/net/mac80211.h ieee80211_stop_tx_ba_cb_irqsafe
497+
!Finclude/net/mac80211.h rate_control_changed
498+
!Finclude/net/mac80211.h ieee80211_tx_rate_control
499+
!Finclude/net/mac80211.h rate_control_send_low
441500
</chapter>
442501
</part>
443502

@@ -485,6 +544,13 @@
485544
</sect1>
486545
</chapter>
487546

547+
<chapter id="aggregation-internals">
548+
<title>Aggregation</title>
549+
!Fnet/mac80211/sta_info.h sta_ampdu_mlme
550+
!Fnet/mac80211/sta_info.h tid_ampdu_tx
551+
!Fnet/mac80211/sta_info.h tid_ampdu_rx
552+
</chapter>
553+
488554
<chapter id="synchronisation">
489555
<title>Synchronisation</title>
490556
<para>TBD</para>

0 commit comments

Comments
 (0)