diff options
author | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-09-03 09:28:30 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-09-03 09:34:51 -0400 |
commit | ace1fe1231bdfffd60b5e703aa5b7283fbf98dbd (patch) | |
tree | 06c7492a8f3cc65f916768616ca24c6bc7171761 /Documentation | |
parent | ce9f3f31efb88841e4df98794b13dbac8c4901da (diff) | |
parent | a2dc375e12334b3d8f787a48b2fb6172ccfb80ae (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
This merges (3f509c6 netfilter: nf_nat_sip: fix incorrect handling
of EBUSY for RTCP expectation) to Patrick McHardy's IPv6 NAT changes.
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt | 75 | ||||
-rw-r--r-- | Documentation/networking/batman-adv.txt | 7 | ||||
-rw-r--r-- | Documentation/networking/ip-sysctl.txt | 37 | ||||
-rw-r--r-- | Documentation/networking/stmmac.txt | 5 |
4 files changed, 107 insertions, 17 deletions
diff --git a/Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt b/Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt new file mode 100644 index 000000000000..8516929c7251 --- /dev/null +++ b/Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt | |||
@@ -0,0 +1,75 @@ | |||
1 | Properties for an MDIO bus multiplexer controlled by a memory-mapped device | ||
2 | |||
3 | This is a special case of a MDIO bus multiplexer. A memory-mapped device, | ||
4 | like an FPGA, is used to control which child bus is connected. The mdio-mux | ||
5 | node must be a child of the memory-mapped device. The driver currently only | ||
6 | supports devices with eight-bit registers. | ||
7 | |||
8 | Required properties in addition to the generic multiplexer properties: | ||
9 | |||
10 | - compatible : string, must contain "mdio-mux-mmioreg" | ||
11 | |||
12 | - reg : integer, contains the offset of the register that controls the bus | ||
13 | multiplexer. The size field in the 'reg' property is the size of | ||
14 | register, and must therefore be 1. | ||
15 | |||
16 | - mux-mask : integer, contains an eight-bit mask that specifies which | ||
17 | bits in the register control the actual bus multiplexer. The | ||
18 | 'reg' property of each child mdio-mux node must be constrained by | ||
19 | this mask. | ||
20 | |||
21 | Example: | ||
22 | |||
23 | The FPGA node defines a memory-mapped FPGA with a register space of 0x30 bytes. | ||
24 | For the "EMI2" MDIO bus, register 9 (BRDCFG1) controls the mux on that bus. | ||
25 | A bitmask of 0x6 means that bits 1 and 2 (bit 0 is lsb) are the bits on | ||
26 | BRDCFG1 that control the actual mux. | ||
27 | |||
28 | /* The FPGA node */ | ||
29 | fpga: board-control@3,0 { | ||
30 | #address-cells = <1>; | ||
31 | #size-cells = <1>; | ||
32 | compatible = "fsl,p5020ds-fpga", "fsl,fpga-ngpixis"; | ||
33 | reg = <3 0 0x30>; | ||
34 | ranges = <0 3 0 0x30>; | ||
35 | |||
36 | mdio-mux-emi2 { | ||
37 | compatible = "mdio-mux-mmioreg", "mdio-mux"; | ||
38 | mdio-parent-bus = <&xmdio0>; | ||
39 | #address-cells = <1>; | ||
40 | #size-cells = <0>; | ||
41 | reg = <9 1>; // BRDCFG1 | ||
42 | mux-mask = <0x6>; // EMI2 | ||
43 | |||
44 | emi2_slot1: mdio@0 { // Slot 1 XAUI (FM2) | ||
45 | reg = <0>; | ||
46 | #address-cells = <1>; | ||
47 | #size-cells = <0>; | ||
48 | |||
49 | phy_xgmii_slot1: ethernet-phy@0 { | ||
50 | compatible = "ethernet-phy-ieee802.3-c45"; | ||
51 | reg = <4>; | ||
52 | }; | ||
53 | }; | ||
54 | |||
55 | emi2_slot2: mdio@2 { // Slot 2 XAUI (FM1) | ||
56 | reg = <2>; | ||
57 | #address-cells = <1>; | ||
58 | #size-cells = <0>; | ||
59 | |||
60 | phy_xgmii_slot2: ethernet-phy@4 { | ||
61 | compatible = "ethernet-phy-ieee802.3-c45"; | ||
62 | reg = <0>; | ||
63 | }; | ||
64 | }; | ||
65 | }; | ||
66 | }; | ||
67 | |||
68 | /* The parent MDIO bus. */ | ||
69 | xmdio0: mdio@f1000 { | ||
70 | #address-cells = <1>; | ||
71 | #size-cells = <0>; | ||
72 | compatible = "fsl,fman-xmdio"; | ||
73 | reg = <0xf1000 0x1000>; | ||
74 | interrupts = <100 1 0 0>; | ||
75 | }; | ||
diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index 8f3ae4a6147e..a173d2a879f5 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt | |||
@@ -75,9 +75,10 @@ folder: | |||
75 | 75 | ||
76 | There is a special folder for debugging information: | 76 | There is a special folder for debugging information: |
77 | 77 | ||
78 | # ls /sys/kernel/debug/batman_adv/bat0/ | 78 | # ls /sys/kernel/debug/batman_adv/bat0/ |
79 | # bla_claim_table log socket transtable_local | 79 | # bla_backbone_table log transtable_global |
80 | # gateways originators transtable_global vis_data | 80 | # bla_claim_table originators transtable_local |
81 | # gateways socket vis_data | ||
81 | 82 | ||
82 | Some of the files contain all sort of status information regard- | 83 | Some of the files contain all sort of status information regard- |
83 | ing the mesh network. For example, you can view the table of | 84 | ing the mesh network. For example, you can view the table of |
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt index ca447b35b833..c7fc10724948 100644 --- a/Documentation/networking/ip-sysctl.txt +++ b/Documentation/networking/ip-sysctl.txt | |||
@@ -439,7 +439,9 @@ tcp_stdurg - BOOLEAN | |||
439 | tcp_synack_retries - INTEGER | 439 | tcp_synack_retries - INTEGER |
440 | Number of times SYNACKs for a passive TCP connection attempt will | 440 | Number of times SYNACKs for a passive TCP connection attempt will |
441 | be retransmitted. Should not be higher than 255. Default value | 441 | be retransmitted. Should not be higher than 255. Default value |
442 | is 5, which corresponds to ~180seconds. | 442 | is 5, which corresponds to 31seconds till the last retransmission |
443 | with the current initial RTO of 1second. With this the final timeout | ||
444 | for a passive TCP connection will happen after 63seconds. | ||
443 | 445 | ||
444 | tcp_syncookies - BOOLEAN | 446 | tcp_syncookies - BOOLEAN |
445 | Only valid when the kernel was compiled with CONFIG_SYNCOOKIES | 447 | Only valid when the kernel was compiled with CONFIG_SYNCOOKIES |
@@ -465,20 +467,37 @@ tcp_syncookies - BOOLEAN | |||
465 | tcp_fastopen - INTEGER | 467 | tcp_fastopen - INTEGER |
466 | Enable TCP Fast Open feature (draft-ietf-tcpm-fastopen) to send data | 468 | Enable TCP Fast Open feature (draft-ietf-tcpm-fastopen) to send data |
467 | in the opening SYN packet. To use this feature, the client application | 469 | in the opening SYN packet. To use this feature, the client application |
468 | must not use connect(). Instead, it should use sendmsg() or sendto() | 470 | must use sendmsg() or sendto() with MSG_FASTOPEN flag rather than |
469 | with MSG_FASTOPEN flag which performs a TCP handshake automatically. | 471 | connect() to perform a TCP handshake automatically. |
470 | 472 | ||
471 | The values (bitmap) are: | 473 | The values (bitmap) are |
472 | 1: Enables sending data in the opening SYN on the client | 474 | 1: Enables sending data in the opening SYN on the client. |
473 | 5: Enables sending data in the opening SYN on the client regardless | 475 | 2: Enables TCP Fast Open on the server side, i.e., allowing data in |
474 | of cookie availability. | 476 | a SYN packet to be accepted and passed to the application before |
477 | 3-way hand shake finishes. | ||
478 | 4: Send data in the opening SYN regardless of cookie availability and | ||
479 | without a cookie option. | ||
480 | 0x100: Accept SYN data w/o validating the cookie. | ||
481 | 0x200: Accept data-in-SYN w/o any cookie option present. | ||
482 | 0x400/0x800: Enable Fast Open on all listeners regardless of the | ||
483 | TCP_FASTOPEN socket option. The two different flags designate two | ||
484 | different ways of setting max_qlen without the TCP_FASTOPEN socket | ||
485 | option. | ||
475 | 486 | ||
476 | Default: 0 | 487 | Default: 0 |
477 | 488 | ||
489 | Note that the client & server side Fast Open flags (1 and 2 | ||
490 | respectively) must be also enabled before the rest of flags can take | ||
491 | effect. | ||
492 | |||
493 | See include/net/tcp.h and the code for more details. | ||
494 | |||
478 | tcp_syn_retries - INTEGER | 495 | tcp_syn_retries - INTEGER |
479 | Number of times initial SYNs for an active TCP connection attempt | 496 | Number of times initial SYNs for an active TCP connection attempt |
480 | will be retransmitted. Should not be higher than 255. Default value | 497 | will be retransmitted. Should not be higher than 255. Default value |
481 | is 5, which corresponds to ~180seconds. | 498 | is 6, which corresponds to 63seconds till the last restransmission |
499 | with the current initial RTO of 1second. With this the final timeout | ||
500 | for an active TCP connection attempt will happen after 127seconds. | ||
482 | 501 | ||
483 | tcp_timestamps - BOOLEAN | 502 | tcp_timestamps - BOOLEAN |
484 | Enable timestamps as defined in RFC1323. | 503 | Enable timestamps as defined in RFC1323. |
diff --git a/Documentation/networking/stmmac.txt b/Documentation/networking/stmmac.txt index c676b9cedbd0..ef9ee71b4d7f 100644 --- a/Documentation/networking/stmmac.txt +++ b/Documentation/networking/stmmac.txt | |||
@@ -173,7 +173,6 @@ Where: | |||
173 | For MDIO bus The we have: | 173 | For MDIO bus The we have: |
174 | 174 | ||
175 | struct stmmac_mdio_bus_data { | 175 | struct stmmac_mdio_bus_data { |
176 | int bus_id; | ||
177 | int (*phy_reset)(void *priv); | 176 | int (*phy_reset)(void *priv); |
178 | unsigned int phy_mask; | 177 | unsigned int phy_mask; |
179 | int *irqs; | 178 | int *irqs; |
@@ -181,7 +180,6 @@ For MDIO bus The we have: | |||
181 | }; | 180 | }; |
182 | 181 | ||
183 | Where: | 182 | Where: |
184 | o bus_id: bus identifier; | ||
185 | o phy_reset: hook to reset the phy device attached to the bus. | 183 | o phy_reset: hook to reset the phy device attached to the bus. |
186 | o phy_mask: phy mask passed when register the MDIO bus within the driver. | 184 | o phy_mask: phy mask passed when register the MDIO bus within the driver. |
187 | o irqs: list of IRQs, one per PHY. | 185 | o irqs: list of IRQs, one per PHY. |
@@ -230,9 +228,6 @@ there are two MAC cores: one MAC is for MDIO Bus/PHY emulation | |||
230 | with fixed_link support. | 228 | with fixed_link support. |
231 | 229 | ||
232 | static struct stmmac_mdio_bus_data stmmac1_mdio_bus = { | 230 | static struct stmmac_mdio_bus_data stmmac1_mdio_bus = { |
233 | .bus_id = 1, | ||
234 | | | ||
235 | |-> phy device on the bus_id 1 | ||
236 | .phy_reset = phy_reset; | 231 | .phy_reset = phy_reset; |
237 | | | 232 | | |
238 | |-> function to provide the phy_reset on this board | 233 | |-> function to provide the phy_reset on this board |