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

Commit 2c90331c 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) Fix double SKB free in bluetooth 6lowpan layer, from Jukka Rissanen.

 2) Fix receive checksum handling in enic driver, from Govindarajulu
    Varadarajan.

 3) Fix NAPI poll list corruption in virtio_net and caif_virtio, from
    Herbert Xu.  Also, add code to detect drivers that have this mistake
    in the future.

 4) Fix doorbell endianness handling in mlx4 driver, from Amir Vadai.

 5) Don't clobber IP6CB() before xfrm6_policy_check() is called in TCP
    input path,f rom Nicolas Dichtel.

 6) Fix MPLS action validation in openvswitch, from Pravin B Shelar.

 7) Fix double SKB free in vxlan driver, also from Pravin.

 8) When we scrub a packet, which happens when we are switching the
    context of the packet (namespace, etc.), we should reset the
    secmark.  From Thomas Graf.

 9) ->ndo_gso_check() needs to do more than return true/false, it also
    has to allow the driver to clear netdev feature bits in order for
    the caller to be able to proceed properly.  From Jesse Gross.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (62 commits)
  genetlink: A genl_bind() to an out-of-range multicast group should not WARN().
  netlink/genetlink: pass network namespace to bind/unbind
  ne2k-pci: Add pci_disable_device in error handling
  bonding: change error message to debug message in __bond_release_one()
  genetlink: pass multicast bind/unbind to families
  netlink: call unbind when releasing socket
  netlink: update listeners directly when removing socket
  genetlink: pass only network namespace to genl_has_listeners()
  netlink: rename netlink_unbind() to netlink_undo_bind()
  net: Generalize ndo_gso_check to ndo_features_check
  net: incorrect use of init_completion fixup
  neigh: remove next ptr from struct neigh_table
  net: xilinx: Remove unnecessary temac_property in the driver
  net: phy: micrel: use generic config_init for KSZ8021/KSZ8031
  net/core: Handle csum for CHECKSUM_COMPLETE VXLAN forwarding
  openvswitch: fix odd_ptr_err.cocci warnings
  Bluetooth: Fix accepting connections when not using mgmt
  Bluetooth: Fix controller configuration with HCI_QUIRK_INVALID_BDADDR
  brcmfmac: Do not crash if platform data is not populated
  ipw2200: select CFG80211_WEXT
  ...
parents 6ab1e8de dc97a1a9

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1648,7 +1648,7 @@ static int __bond_release_one(struct net_device *bond_dev, 
	/* slave is not a slave or master is not master of this slave */

	if (!(slave_dev->flags & IFF_SLAVE) ||

	    !netdev_has_upper_dev(slave_dev, bond_dev)) {

		netdev_err(bond_dev, "cannot release %s\n",

		netdev_dbg(bond_dev, "cannot release %s\n",

			   slave_dev->name);

		return -EINVAL;

	}

drivers/net/caif/caif_virtio.c

+0 −2
Original line number Diff line number Diff line
@@ -257,7 +257,6 @@ static int cfv_rx_poll(struct napi_struct *napi, int quota) 
	struct vringh_kiov *riov = &cfv->ctx.riov;

	unsigned int skb_len;



again:

	do {

		skb = NULL;
@@ -322,7 +321,6 @@ static int cfv_rx_poll(struct napi_struct *napi, int quota) 
		    napi_schedule_prep(napi)) {

			vringh_notify_disable_kern(cfv->vr_rx);

			__napi_schedule(napi);

			goto again;

		}

		break;

drivers/net/ethernet/8390/ne2k-pci.c

+4 −2
Original line number Diff line number Diff line
@@ -246,13 +246,13 @@ static int ne2k_pci_init_one(struct pci_dev *pdev, 


	if (!ioaddr || ((pci_resource_flags (pdev, 0) & IORESOURCE_IO) == 0)) {

		dev_err(&pdev->dev, "no I/O resource at PCI BAR #0\n");

		return -ENODEV;

		goto err_out;

	}



	if (request_region (ioaddr, NE_IO_EXTENT, DRV_NAME) == NULL) {

		dev_err(&pdev->dev, "I/O resource 0x%x @ 0x%lx busy\n",

			NE_IO_EXTENT, ioaddr);

		return -EBUSY;

		goto err_out;

	}



	reg0 = inb(ioaddr);
@@ -392,6 +392,8 @@ static int ne2k_pci_init_one(struct pci_dev *pdev, 
	free_netdev (dev);

err_out_free_res:

	release_region (ioaddr, NE_IO_EXTENT);

err_out:

	pci_disable_device(pdev);

	return -ENODEV;

}

drivers/net/ethernet/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -156,18 +156,6 @@ source "drivers/net/ethernet/realtek/Kconfig" 
source "drivers/net/ethernet/renesas/Kconfig"

source "drivers/net/ethernet/rdc/Kconfig"

source "drivers/net/ethernet/rocker/Kconfig"



config S6GMAC

	tristate "S6105 GMAC ethernet support"

	depends on XTENSA_VARIANT_S6000

	select PHYLIB

	---help---

	  This driver supports the on chip ethernet device on the

	  S6105 xtensa processor.



	  To compile this driver as a module, choose M here. The module

	  will be called s6gmac.



source "drivers/net/ethernet/samsung/Kconfig"

source "drivers/net/ethernet/seeq/Kconfig"

source "drivers/net/ethernet/silan/Kconfig"

drivers/net/ethernet/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ 
obj-$(CONFIG_SH_ETH) += renesas/

obj-$(CONFIG_NET_VENDOR_RDC) += rdc/

obj-$(CONFIG_NET_VENDOR_ROCKER) += rocker/

obj-$(CONFIG_S6GMAC) += s6gmac.o

obj-$(CONFIG_NET_VENDOR_SAMSUNG) += samsung/

obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/

obj-$(CONFIG_NET_VENDOR_SILAN) += silan/