Loading Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt 0 → 100644 +75 −0 Original line number Diff line number Diff line Properties for an MDIO bus multiplexer controlled by a memory-mapped device This is a special case of a MDIO bus multiplexer. A memory-mapped device, like an FPGA, is used to control which child bus is connected. The mdio-mux node must be a child of the memory-mapped device. The driver currently only supports devices with eight-bit registers. Required properties in addition to the generic multiplexer properties: - compatible : string, must contain "mdio-mux-mmioreg" - reg : integer, contains the offset of the register that controls the bus multiplexer. The size field in the 'reg' property is the size of register, and must therefore be 1. - mux-mask : integer, contains an eight-bit mask that specifies which bits in the register control the actual bus multiplexer. The 'reg' property of each child mdio-mux node must be constrained by this mask. Example: The FPGA node defines a memory-mapped FPGA with a register space of 0x30 bytes. For the "EMI2" MDIO bus, register 9 (BRDCFG1) controls the mux on that bus. A bitmask of 0x6 means that bits 1 and 2 (bit 0 is lsb) are the bits on BRDCFG1 that control the actual mux. /* The FPGA node */ fpga: board-control@3,0 { #address-cells = <1>; #size-cells = <1>; compatible = "fsl,p5020ds-fpga", "fsl,fpga-ngpixis"; reg = <3 0 0x30>; ranges = <0 3 0 0x30>; mdio-mux-emi2 { compatible = "mdio-mux-mmioreg", "mdio-mux"; mdio-parent-bus = <&xmdio0>; #address-cells = <1>; #size-cells = <0>; reg = <9 1>; // BRDCFG1 mux-mask = <0x6>; // EMI2 emi2_slot1: mdio@0 { // Slot 1 XAUI (FM2) reg = <0>; #address-cells = <1>; #size-cells = <0>; phy_xgmii_slot1: ethernet-phy@0 { compatible = "ethernet-phy-ieee802.3-c45"; reg = <4>; }; }; emi2_slot2: mdio@2 { // Slot 2 XAUI (FM1) reg = <2>; #address-cells = <1>; #size-cells = <0>; phy_xgmii_slot2: ethernet-phy@4 { compatible = "ethernet-phy-ieee802.3-c45"; reg = <0>; }; }; }; }; /* The parent MDIO bus. */ xmdio0: mdio@f1000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,fman-xmdio"; reg = <0xf1000 0x1000>; interrupts = <100 1 0 0>; }; Documentation/networking/batman-adv.txt +4 −3 Original line number Diff line number Diff line Loading @@ -76,8 +76,9 @@ folder: There is a special folder for debugging information: # ls /sys/kernel/debug/batman_adv/bat0/ # bla_claim_table log socket transtable_local # gateways originators transtable_global vis_data # bla_backbone_table log transtable_global # bla_claim_table originators transtable_local # gateways socket vis_data Some of the files contain all sort of status information regard- ing the mesh network. For example, you can view the table of Loading Documentation/networking/ip-sysctl.txt +28 −9 Original line number Diff line number Diff line Loading @@ -439,7 +439,9 @@ tcp_stdurg - BOOLEAN tcp_synack_retries - INTEGER Number of times SYNACKs for a passive TCP connection attempt will be retransmitted. Should not be higher than 255. Default value is 5, which corresponds to ~180seconds. is 5, which corresponds to 31seconds till the last retransmission with the current initial RTO of 1second. With this the final timeout for a passive TCP connection will happen after 63seconds. tcp_syncookies - BOOLEAN Only valid when the kernel was compiled with CONFIG_SYNCOOKIES Loading @@ -465,20 +467,37 @@ tcp_syncookies - BOOLEAN tcp_fastopen - INTEGER Enable TCP Fast Open feature (draft-ietf-tcpm-fastopen) to send data in the opening SYN packet. To use this feature, the client application must not use connect(). Instead, it should use sendmsg() or sendto() with MSG_FASTOPEN flag which performs a TCP handshake automatically. The values (bitmap) are: 1: Enables sending data in the opening SYN on the client 5: Enables sending data in the opening SYN on the client regardless of cookie availability. must use sendmsg() or sendto() with MSG_FASTOPEN flag rather than connect() to perform a TCP handshake automatically. The values (bitmap) are 1: Enables sending data in the opening SYN on the client. 2: Enables TCP Fast Open on the server side, i.e., allowing data in a SYN packet to be accepted and passed to the application before 3-way hand shake finishes. 4: Send data in the opening SYN regardless of cookie availability and without a cookie option. 0x100: Accept SYN data w/o validating the cookie. 0x200: Accept data-in-SYN w/o any cookie option present. 0x400/0x800: Enable Fast Open on all listeners regardless of the TCP_FASTOPEN socket option. The two different flags designate two different ways of setting max_qlen without the TCP_FASTOPEN socket option. Default: 0 Note that the client & server side Fast Open flags (1 and 2 respectively) must be also enabled before the rest of flags can take effect. See include/net/tcp.h and the code for more details. tcp_syn_retries - INTEGER Number of times initial SYNs for an active TCP connection attempt will be retransmitted. Should not be higher than 255. Default value is 5, which corresponds to ~180seconds. is 6, which corresponds to 63seconds till the last restransmission with the current initial RTO of 1second. With this the final timeout for an active TCP connection attempt will happen after 127seconds. tcp_timestamps - BOOLEAN Enable timestamps as defined in RFC1323. Loading Documentation/networking/stmmac.txt +0 −5 Original line number Diff line number Diff line Loading @@ -173,7 +173,6 @@ Where: For MDIO bus The we have: struct stmmac_mdio_bus_data { int bus_id; int (*phy_reset)(void *priv); unsigned int phy_mask; int *irqs; Loading @@ -181,7 +180,6 @@ For MDIO bus The we have: }; Where: o bus_id: bus identifier; o phy_reset: hook to reset the phy device attached to the bus. o phy_mask: phy mask passed when register the MDIO bus within the driver. o irqs: list of IRQs, one per PHY. Loading Loading @@ -230,9 +228,6 @@ there are two MAC cores: one MAC is for MDIO Bus/PHY emulation with fixed_link support. static struct stmmac_mdio_bus_data stmmac1_mdio_bus = { .bus_id = 1, | |-> phy device on the bus_id 1 .phy_reset = phy_reset; | |-> function to provide the phy_reset on this board Loading Makefile +1 −1 Original line number Diff line number Diff line VERSION = 3 PATCHLEVEL = 6 SUBLEVEL = 0 EXTRAVERSION = -rc2 EXTRAVERSION = -rc3 NAME = Saber-toothed Squirrel # *DOCUMENTATION* Loading Loading
Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt 0 → 100644 +75 −0 Original line number Diff line number Diff line Properties for an MDIO bus multiplexer controlled by a memory-mapped device This is a special case of a MDIO bus multiplexer. A memory-mapped device, like an FPGA, is used to control which child bus is connected. The mdio-mux node must be a child of the memory-mapped device. The driver currently only supports devices with eight-bit registers. Required properties in addition to the generic multiplexer properties: - compatible : string, must contain "mdio-mux-mmioreg" - reg : integer, contains the offset of the register that controls the bus multiplexer. The size field in the 'reg' property is the size of register, and must therefore be 1. - mux-mask : integer, contains an eight-bit mask that specifies which bits in the register control the actual bus multiplexer. The 'reg' property of each child mdio-mux node must be constrained by this mask. Example: The FPGA node defines a memory-mapped FPGA with a register space of 0x30 bytes. For the "EMI2" MDIO bus, register 9 (BRDCFG1) controls the mux on that bus. A bitmask of 0x6 means that bits 1 and 2 (bit 0 is lsb) are the bits on BRDCFG1 that control the actual mux. /* The FPGA node */ fpga: board-control@3,0 { #address-cells = <1>; #size-cells = <1>; compatible = "fsl,p5020ds-fpga", "fsl,fpga-ngpixis"; reg = <3 0 0x30>; ranges = <0 3 0 0x30>; mdio-mux-emi2 { compatible = "mdio-mux-mmioreg", "mdio-mux"; mdio-parent-bus = <&xmdio0>; #address-cells = <1>; #size-cells = <0>; reg = <9 1>; // BRDCFG1 mux-mask = <0x6>; // EMI2 emi2_slot1: mdio@0 { // Slot 1 XAUI (FM2) reg = <0>; #address-cells = <1>; #size-cells = <0>; phy_xgmii_slot1: ethernet-phy@0 { compatible = "ethernet-phy-ieee802.3-c45"; reg = <4>; }; }; emi2_slot2: mdio@2 { // Slot 2 XAUI (FM1) reg = <2>; #address-cells = <1>; #size-cells = <0>; phy_xgmii_slot2: ethernet-phy@4 { compatible = "ethernet-phy-ieee802.3-c45"; reg = <0>; }; }; }; }; /* The parent MDIO bus. */ xmdio0: mdio@f1000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,fman-xmdio"; reg = <0xf1000 0x1000>; interrupts = <100 1 0 0>; };
Documentation/networking/batman-adv.txt +4 −3 Original line number Diff line number Diff line Loading @@ -76,8 +76,9 @@ folder: There is a special folder for debugging information: # ls /sys/kernel/debug/batman_adv/bat0/ # bla_claim_table log socket transtable_local # gateways originators transtable_global vis_data # bla_backbone_table log transtable_global # bla_claim_table originators transtable_local # gateways socket vis_data Some of the files contain all sort of status information regard- ing the mesh network. For example, you can view the table of Loading
Documentation/networking/ip-sysctl.txt +28 −9 Original line number Diff line number Diff line Loading @@ -439,7 +439,9 @@ tcp_stdurg - BOOLEAN tcp_synack_retries - INTEGER Number of times SYNACKs for a passive TCP connection attempt will be retransmitted. Should not be higher than 255. Default value is 5, which corresponds to ~180seconds. is 5, which corresponds to 31seconds till the last retransmission with the current initial RTO of 1second. With this the final timeout for a passive TCP connection will happen after 63seconds. tcp_syncookies - BOOLEAN Only valid when the kernel was compiled with CONFIG_SYNCOOKIES Loading @@ -465,20 +467,37 @@ tcp_syncookies - BOOLEAN tcp_fastopen - INTEGER Enable TCP Fast Open feature (draft-ietf-tcpm-fastopen) to send data in the opening SYN packet. To use this feature, the client application must not use connect(). Instead, it should use sendmsg() or sendto() with MSG_FASTOPEN flag which performs a TCP handshake automatically. The values (bitmap) are: 1: Enables sending data in the opening SYN on the client 5: Enables sending data in the opening SYN on the client regardless of cookie availability. must use sendmsg() or sendto() with MSG_FASTOPEN flag rather than connect() to perform a TCP handshake automatically. The values (bitmap) are 1: Enables sending data in the opening SYN on the client. 2: Enables TCP Fast Open on the server side, i.e., allowing data in a SYN packet to be accepted and passed to the application before 3-way hand shake finishes. 4: Send data in the opening SYN regardless of cookie availability and without a cookie option. 0x100: Accept SYN data w/o validating the cookie. 0x200: Accept data-in-SYN w/o any cookie option present. 0x400/0x800: Enable Fast Open on all listeners regardless of the TCP_FASTOPEN socket option. The two different flags designate two different ways of setting max_qlen without the TCP_FASTOPEN socket option. Default: 0 Note that the client & server side Fast Open flags (1 and 2 respectively) must be also enabled before the rest of flags can take effect. See include/net/tcp.h and the code for more details. tcp_syn_retries - INTEGER Number of times initial SYNs for an active TCP connection attempt will be retransmitted. Should not be higher than 255. Default value is 5, which corresponds to ~180seconds. is 6, which corresponds to 63seconds till the last restransmission with the current initial RTO of 1second. With this the final timeout for an active TCP connection attempt will happen after 127seconds. tcp_timestamps - BOOLEAN Enable timestamps as defined in RFC1323. Loading
Documentation/networking/stmmac.txt +0 −5 Original line number Diff line number Diff line Loading @@ -173,7 +173,6 @@ Where: For MDIO bus The we have: struct stmmac_mdio_bus_data { int bus_id; int (*phy_reset)(void *priv); unsigned int phy_mask; int *irqs; Loading @@ -181,7 +180,6 @@ For MDIO bus The we have: }; Where: o bus_id: bus identifier; o phy_reset: hook to reset the phy device attached to the bus. o phy_mask: phy mask passed when register the MDIO bus within the driver. o irqs: list of IRQs, one per PHY. Loading Loading @@ -230,9 +228,6 @@ there are two MAC cores: one MAC is for MDIO Bus/PHY emulation with fixed_link support. static struct stmmac_mdio_bus_data stmmac1_mdio_bus = { .bus_id = 1, | |-> phy device on the bus_id 1 .phy_reset = phy_reset; | |-> function to provide the phy_reset on this board Loading
Makefile +1 −1 Original line number Diff line number Diff line VERSION = 3 PATCHLEVEL = 6 SUBLEVEL = 0 EXTRAVERSION = -rc2 EXTRAVERSION = -rc3 NAME = Saber-toothed Squirrel # *DOCUMENTATION* Loading