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

Commit dbbffe68 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:
 "Several small bug fixes all over:

   1) be2net driver uses wrong payload length when submitting MAC list
      get requests to the chip.  From Sathya Perla.

   2) Fix mwifiex memory leak on driver unload, from Amitkumar Karwar.

   3) Prevent random memory access in batman-adv, from Marek Lindner.

   4) batman-adv doesn't check for pskb_trim_rcsum() errors, also from
      Marek Lindner.

   5) Fix fec crashes on rapid link up/down, from Frank Li.

   6) Fix inner protocol grovelling in GSO, from Pravin B Shelar.

   7) Link event validation fix in qlcnic from Rajesh Borundia.

   8) Not all FEC chips can support checksum offload, fix from Shawn
      Guo.

   9) EXPORT_SYMBOL + inline doesn't make any sense, from Denis Efremov.

  10) Fix race in passthru mode during device removal in macvlan, from
      Jiri Pirko.

  11) Fix RCU hash table lookup socket state race in ipv6, leading to
      NULL pointer derefs, from Eric Dumazet.

  12) Add several missing HAS_DMA kconfig dependencies, from Geert
      Uyttterhoeven.

  13) Fix bogus PCI resource management in 3c59x driver, from Sergei
      Shtylyov.

  14) Fix info leak in ipv6 GRE tunnel driver, from Amerigo Wang.

  15) Fix device leak in ipv6 IPSEC policy layer, from Cong Wang.

  16) DMA mapping leak fix in qlge from Thadeu Lima de Souza Cascardo.

  17) Missing iounmap on probe failure in bna driver, from Wei Yongjun."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (40 commits)
  bna: add missing iounmap() on error in bnad_init()
  qlge: fix dma map leak when the last chunk is not allocated
  xfrm6: release dev before returning error
  ipv6,gre: do not leak info to user-space
  virtio_net: use default napi weight by default
  emac: Fix EMAC soft reset on 460EX/GT
  3c59x: fix PCI resource management
  caif: CAIF_VIRTIO should depend on HAS_DMA
  net/ethernet: MACB should depend on HAS_DMA
  net/ethernet: ARM_AT91_ETHER should depend on HAS_DMA
  net/wireless: ATH9K should depend on HAS_DMA
  net/ethernet: STMMAC_ETH should depend on HAS_DMA
  net/ethernet: NET_CALXEDA_XGMAC should depend on HAS_DMA
  ipv6: do not clear pinet6 field
  macvlan: fix passthru mode race between dev removal and rx path
  ipv4: ip_output: remove inline marking of EXPORT_SYMBOL functions
  net/mlx4: Strengthen VLAN tags/priorities enforcement in VST mode
  net/mlx4_core: Add missing report on VST and spoof-checking dev caps
  net: fec: enable hardware checksum only on imx6q-fec
  qlcnic: Fix validation of link event command.
  ...
parents 1f638766 ba21fc69

drivers/net/caif/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ config CAIF_HSI 


config CAIF_VIRTIO

	tristate "CAIF virtio transport driver"

	depends on CAIF

	depends on CAIF && HAS_DMA

	select VHOST_RING

	select VIRTIO

	select GENERIC_ALLOCATOR

drivers/net/ethernet/3com/3c59x.c

+13 −12
Original line number Diff line number Diff line
@@ -632,7 +632,6 @@ struct vortex_private { 
		pm_state_valid:1,				/* pci_dev->saved_config_space has sane contents */

		open:1,

		medialock:1,

		must_free_region:1,				/* Flag: if zero, Cardbus owns the I/O region */

		large_frames:1,			/* accept large frames */

		handling_irq:1;			/* private in_irq indicator */

	/* {get|set}_wol operations are already serialized by rtnl.
@@ -1012,6 +1011,12 @@ static int vortex_init_one(struct pci_dev *pdev, 
	if (rc < 0)

		goto out;



	rc = pci_request_regions(pdev, DRV_NAME);

	if (rc < 0) {

		pci_disable_device(pdev);

		goto out;

	}



	unit = vortex_cards_found;



	if (global_use_mmio < 0 && (unit >= MAX_UNITS || use_mmio[unit] < 0)) {
@@ -1027,6 +1032,7 @@ static int vortex_init_one(struct pci_dev *pdev, 
	if (!ioaddr) /* If mapping fails, fall-back to BAR 0... */

		ioaddr = pci_iomap(pdev, 0, 0);

	if (!ioaddr) {

		pci_release_regions(pdev);

		pci_disable_device(pdev);

		rc = -ENOMEM;

		goto out;
@@ -1036,6 +1042,7 @@ static int vortex_init_one(struct pci_dev *pdev, 
			   ent->driver_data, unit);

	if (rc < 0) {

		pci_iounmap(pdev, ioaddr);

		pci_release_regions(pdev);

		pci_disable_device(pdev);

		goto out;

	}
@@ -1178,11 +1185,6 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq, 


	/* PCI-only startup logic */

	if (pdev) {

		/* EISA resources already marked, so only PCI needs to do this here */

		/* Ignore return value, because Cardbus drivers already allocate for us */

		if (request_region(dev->base_addr, vci->io_size, print_name) != NULL)

			vp->must_free_region = 1;



		/* enable bus-mastering if necessary */

		if (vci->flags & PCI_USES_MASTER)

			pci_set_master(pdev);
@@ -1220,7 +1222,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq, 
					   &vp->rx_ring_dma);

	retval = -ENOMEM;

	if (!vp->rx_ring)

		goto free_region;

		goto free_device;



	vp->tx_ring = (struct boom_tx_desc *)(vp->rx_ring + RX_RING_SIZE);

	vp->tx_ring_dma = vp->rx_ring_dma + sizeof(struct boom_rx_desc) * RX_RING_SIZE;
@@ -1484,9 +1486,7 @@ static int vortex_probe1(struct device *gendev, void __iomem *ioaddr, int irq, 
							+ sizeof(struct boom_tx_desc) * TX_RING_SIZE,

						vp->rx_ring,

						vp->rx_ring_dma);

free_region:

	if (vp->must_free_region)

		release_region(dev->base_addr, vci->io_size);

free_device:

	free_netdev(dev);

	pr_err(PFX "vortex_probe1 fails.  Returns %d\n", retval);

out:
@@ -3254,8 +3254,9 @@ static void vortex_remove_one(struct pci_dev *pdev) 
							+ sizeof(struct boom_tx_desc) * TX_RING_SIZE,

						vp->rx_ring,

						vp->rx_ring_dma);

	if (vp->must_free_region)

		release_region(dev->base_addr, vp->io_size);



	pci_release_regions(pdev);



	free_netdev(dev);

}

drivers/net/ethernet/brocade/bna/bnad.c

+3 −2
Original line number Diff line number Diff line
@@ -3236,9 +3236,10 @@ bnad_init(struct bnad *bnad, 


	sprintf(bnad->wq_name, "%s_wq_%d", BNAD_NAME, bnad->id);

	bnad->work_q = create_singlethread_workqueue(bnad->wq_name);



	if (!bnad->work_q)

	if (!bnad->work_q) {

		iounmap(bnad->bar0);

		return -ENOMEM;

	}



	return 0;

}

drivers/net/ethernet/cadence/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ if NET_CADENCE 


config ARM_AT91_ETHER

	tristate "AT91RM9200 Ethernet support"

	depends on GENERIC_HARDIRQS

	depends on GENERIC_HARDIRQS && HAS_DMA

	select NET_CORE

	select MACB

	---help---
@@ -31,6 +31,7 @@ config ARM_AT91_ETHER 


config MACB

	tristate "Cadence MACB/GEM support"

	depends on HAS_DMA

	select PHYLIB

	---help---

	  The Cadence MACB ethernet interface is found on many Atmel AT32 and

drivers/net/ethernet/calxeda/Kconfig

+1 −1
Original line number Diff line number Diff line 
config NET_CALXEDA_XGMAC

	tristate "Calxeda 1G/10G XGMAC Ethernet driver"

	depends on HAS_IOMEM

	depends on HAS_IOMEM && HAS_DMA

	select CRC32

	help

	  This is the driver for the XGMAC Ethernet IP block found on Calxeda