Merge "Merge android-4.9.134 (a427932) into msm-4.9" (4595b7fb) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/net/macb.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,7 @@ Required properties:
		Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
		the Cadence GEM, or the generic form: "cdns,gem".
		Use "atmel,sama5d2-gem" for the GEM IP (10/100) available on Atmel sama5d2 SoCs.
		Use "atmel,sama5d3-macb" for the 10/100Mbit IP available on Atmel sama5d3 SoCs.
		Use "atmel,sama5d3-gem" for the Gigabit IP available on Atmel sama5d3 SoCs.
		Use "atmel,sama5d4-gem" for the GEM IP (10/100) available on Atmel sama5d4 SoCs.
		Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.

+5 −8

Original line number	Diff line number	Diff line
		@@ -122,14 +122,11 @@ min_adv_mss - INTEGER

		IP Fragmentation:

		ipfrag_high_thresh - INTEGER
		Maximum memory used to reassemble IP fragments. When
		ipfrag_high_thresh bytes of memory is allocated for this purpose,
		the fragment handler will toss packets until ipfrag_low_thresh
		is reached. This also serves as a maximum limit to namespaces
		different from the initial one.

		ipfrag_low_thresh - INTEGER
		ipfrag_high_thresh - LONG INTEGER
		Maximum memory used to reassemble IP fragments.

		ipfrag_low_thresh - LONG INTEGER
		(Obsolete since linux-4.17)
		Maximum memory used to reassemble IP fragments before the kernel
		begins to remove incomplete fragment queues to free up resources.
		The kernel still accepts new fragments for defragmentation.

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@
		};

		macb1: ethernet@f802c000 {
		compatible = "cdns,at91sam9260-macb", "cdns,macb";
		compatible = "atmel,sama5d3-macb", "cdns,at91sam9260-macb", "cdns,macb";
		reg = <0xf802c000 0x100>;
		interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;
		pinctrl-names = "default";

+0 −1