Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b5e09a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 

Pull networking fixes from David Miller:

 1) Netfilter list handling fix, from Linus.

 2) RXRPC/AFS bug fixes from David Howells (oops on call to serviceless
    endpoints, build warnings, missing notifications, etc.) From David
    Howells.

 3) Kernel log message missing newlines, from Colin Ian King.

 4) Don't enter direct reclaim in netlink dumps, the idea is to use a
    high order allocation first and fallback quickly to a 0-order
    allocation if such a high-order one cannot be done cheaply and
    without reclaim. From Eric Dumazet.

 5) Fix firmware download errors in btusb bluetooth driver, from Ethan
    Hsieh.

 6) Missing Kconfig deps for QCOM_EMAC, from Geert Uytterhoeven.

 7) Fix MDIO_XGENE dup Kconfig entry. From Laura Abbott.

 8) Constrain ipv6 rtr_solicits sysctl values properly, from Maciej
    Żenczykowski.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (65 commits)
  netfilter: Fix slab corruption.
  be2net: Enable VF link state setting for BE3
  be2net: Fix TX stats for TSO packets
  be2net: Update Copyright string in be_hw.h
  be2net: NCSI FW section should be properly updated with ethtool for BE3
  be2net: Provide an alternate way to read pf_num for BEx chips
  wan/fsl_ucc_hdlc: Fix size used in dma_free_coherent()
  net: macb: NULL out phydev after removing mdio bus
  xen-netback: make sure that hashes are not send to unaware frontends
  Fixing a bug in team driver due to incorrect 'unsigned int' to 'int' conversion
  MAINTAINERS: add myself as a maintainer of xen-netback
  ipv6 addrconf: disallow rtr_solicits < -1
  Bluetooth: btusb: Fix atheros firmware download error
  drivers: net: phy: Correct duplicate MDIO_XGENE entry
  ethernet: qualcomm: QCOM_EMAC should depend on HAS_DMA and HAS_IOMEM
  net: ethernet: mediatek: remove hwlro property in the device tree
  net: ethernet: mediatek: get hw lro capability by the chip id instead of by the dtsi
  net: ethernet: mediatek: get the chip id by ETHDMASYS registers
  net: bgmac: Fix errant feature flag check
  netlink: do not enter direct reclaim from netlink_dump()
  ...
parents 101105b1 bd3769bf

Documentation/devicetree/bindings/net/mediatek-net.txt

+0 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ Required properties: 
Optional properties:

- interrupt-parent: Should be the phandle for the interrupt controller

  that services interrupts for this device

- mediatek,hwlro: the capability if the hardware supports LRO functions



* Ethernet MAC node
@@ -54,7 +53,6 @@ eth: ethernet@1b100000 { 
	reset-names = "eth";

	mediatek,ethsys = <&ethsys>;

	mediatek,pctl = <&syscfg_pctl_a>;

	mediatek,hwlro;

	#address-cells = <1>;

	#size-cells = <0>;

Documentation/devicetree/bindings/net/micrel-ksz90x1.txt

+4 −3
Original line number Diff line number Diff line
@@ -34,16 +34,17 @@ KSZ9031: 


  All skew control options are specified in picoseconds. The minimum

  value is 0, and the maximum is property-dependent. The increment

  step is 60ps.

  step is 60ps. The default value is the neutral setting, so setting

  rxc-skew-ps=<0> actually results in -900 picoseconds adjustment.



  Optional properties:



    Maximum value of 1860:

    Maximum value of 1860, default value 900:



      - rxc-skew-ps : Skew control of RX clock pad

      - txc-skew-ps : Skew control of TX clock pad



    Maximum value of 900:

    Maximum value of 900, default value 420:



      - rxdv-skew-ps : Skew control of RX CTL pad

      - txen-skew-ps : Skew control of TX CTL pad

Documentation/devicetree/bindings/net/renesas,ravb.txt

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
	      "renesas,etheravb-r8a7793" if the device is a part of R8A7793 SoC.

	      "renesas,etheravb-r8a7794" if the device is a part of R8A7794 SoC.

	      "renesas,etheravb-r8a7795" if the device is a part of R8A7795 SoC.

	      "renesas,etheravb-r8a7796" if the device is a part of R8A7796 SoC.

	      "renesas,etheravb-rcar-gen2" for generic R-Car Gen 2 compatible interface.

	      "renesas,etheravb-rcar-gen3" for generic R-Car Gen 3 compatible interface.
@@ -33,7 +34,7 @@ Optional properties: 
- interrupt-parent: the phandle for the interrupt controller that services

		    interrupts for this device.

- interrupt-names: A list of interrupt names.

		   For the R8A7795 SoC this property is mandatory;

		   For the R8A779[56] SoCs this property is mandatory;

		   it should include one entry per channel, named "ch%u",

		   where %u is the channel number ranging from 0 to 24.

		   For other SoCs this property is optional; if present

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -5033,6 +5033,13 @@ F: drivers/net/ethernet/freescale/fec_ptp.c 
F:	drivers/net/ethernet/freescale/fec.h

F:	Documentation/devicetree/bindings/net/fsl-fec.txt



FREESCALE QORIQ DPAA FMAN DRIVER

M:	Madalin Bucur <madalin.bucur@nxp.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/freescale/fman

F:	Documentation/devicetree/bindings/powerpc/fsl/fman.txt



FREESCALE QUICC ENGINE LIBRARY

L:	linuxppc-dev@lists.ozlabs.org

S:	Orphan
@@ -13128,6 +13135,7 @@ F: arch/arm64/include/asm/xen/ 


XEN NETWORK BACKEND DRIVER

M:	Wei Liu <wei.liu2@citrix.com>

M:	Paul Durrant <paul.durrant@citrix.com>

L:	xen-devel@lists.xenproject.org (moderated for non-subscribers)

L:	netdev@vger.kernel.org

S:	Supported

drivers/bluetooth/btusb.c

+5 −4
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ static const struct usb_device_id blacklist_table[] = { 
	/* Marvell Bluetooth devices */

	{ USB_DEVICE(0x1286, 0x2044), .driver_info = BTUSB_MARVELL },

	{ USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },

	{ USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL },



	/* Intel Bluetooth devices */

	{ USB_DEVICE(0x8087, 0x07da), .driver_info = BTUSB_CSR },
@@ -1042,6 +1043,10 @@ static int btusb_open(struct hci_dev *hdev) 


	BT_DBG("%s", hdev->name);



	err = usb_autopm_get_interface(data->intf);

	if (err < 0)

		return err;



	/* Patching USB firmware files prior to starting any URBs of HCI path

	 * It is more safe to use USB bulk channel for downloading USB patch

	 */
@@ -1051,10 +1056,6 @@ static int btusb_open(struct hci_dev *hdev) 
			return err;

	}



	err = usb_autopm_get_interface(data->intf);

	if (err < 0)

		return err;



	data->intf->needs_remote_wakeup = 1;



	if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags))